[csw-devel] SF.net SVN: gar:[14183] csw/mgar/pkg/bacula/trunk

[bdwalton at users.sourceforge.net]

Revision: 14183
          http://gar.svn.sourceforge.net/gar/?rev=14183&view=rev
Author:   bdwalton
Date:     2011-04-14 16:11:14 +0000 (Thu, 14 Apr 2011)

Log Message:
-----------
bacula/trunk: move a few overrides around due to splits

Modified Paths:
--------------
    csw/mgar/pkg/bacula/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes

Removed Paths:
-------------
    csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes

Modified: csw/mgar/pkg/bacula/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bacula/trunk/Makefile	2011-04-14 15:42:07 UTC (rev 14182)
+++ csw/mgar/pkg/bacula/trunk/Makefile	2011-04-14 16:11:14 UTC (rev 14183)
@@ -26,6 +26,7 @@
 OBSOLETED_BY_CSWbacula-client = CSWbaculaclient
 # set this explicitly to help phil's tools for now
 CATALOG_NAME_CSWbaculaclient = bacula_client_stub
+CHECKPKG_OVERRIDES_CSWbacula-client += surplus-dependency|CSWbacula-fd
 
 CATALOG_NAME_CSWbacula-common = bacula_common
 SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files
@@ -43,7 +44,11 @@
 PKGFILES_CSWbacula-common += .*man1/bsmtp.1.gz .*man1/btraceback.1.gz
 PKGFILES_CSWbacula-common += .*man8/bacula.8.gz
 PKGFILES_CSWbacula-common += .*libexec/btraceback.gdb
+PKGFILES_CSWbacula-common += .*doc/$(NAME)/.*
 CHECKPKG_OVERRIDES_CSWbacula-common += shared-lib-package-contains-so-symlink
+# these are both original documentation files from the tarball
+CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes
+CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL
 
 CATALOG_NAME_CSWbacula-fd = bacula_fd
 SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon
@@ -90,7 +95,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(DISTNAME).tar.gz
-DISTFILES += CSWbacula.cswreleasenotes
+DISTFILES += CSWbacula-common.cswreleasenotes
 PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch
 
 BUILD_DEP_PKGS  = CSWmysql5devel CSWiconv CSWtcpwrap CSWossldevel
@@ -123,10 +128,6 @@
 # no tests supplied.
 TEST_SCRIPTS =
 
-# these are both original documentation files from the tarball
-CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/share|root/opt/csw/share/doc/bacula/technotes
-CHECKPKG_OVERRIDES_CSWbacula += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bacula/INSTALL
-
 include gar/category.mk
 
 pre-configure-modulated:

Added: csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes
===================================================================
--- csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes	                        (rev 0)
+++ csw/mgar/pkg/bacula/trunk/files/CSWbacula-common.cswreleasenotes	2011-04-14 16:11:14 UTC (rev 14183)
@@ -0,0 +1,2 @@
+usr/local, usr/share refs: 
+   original files installed by default directly from tarball extraction

Deleted: csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes
===================================================================
--- csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes	2011-04-14 15:42:07 UTC (rev 14182)
+++ csw/mgar/pkg/bacula/trunk/files/CSWbacula.cswreleasenotes	2011-04-14 16:11:14 UTC (rev 14183)
@@ -1,2 +0,0 @@
-usr/local, usr/share refs: 
-   original files installed by default directly from tarball extraction


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.