[csw-devel] SF.net SVN: gar:[17155] csw/mgar/pkg/cups/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 17155
          http://gar.svn.sourceforge.net/gar/?rev=17155&view=rev
Author:   dmichelsen
Date:     2012-02-23 16:09:24 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
cups/trunk: Move docs over to main package

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

Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile	2012-02-23 15:50:44 UTC (rev 17154)
+++ csw/mgar/pkg/cups/trunk/Makefile	2012-02-23 16:09:24 UTC (rev 17155)
@@ -109,6 +109,7 @@
 PKGFILES_CSWcupsd += $(datadir)/cups/(banners|data|profiles|charsets).*
 PKGFILES_CSWcupsd += $(datadir)/cups/(fonts|templates|charmaps|model).*
 PKGFILES_CSWcupsd += $(datadir)/cups/mime.*
+PKGFILES_CSWcupsd += $(datadir)/doc/cups/.*
 PKGFILES_CSWcupsd += $(datadir)/icons.*
 PKGFILES_CSWcupsd += $(datadir)/locale/.*
 PKGFILES_CSWcupsd += $(libdir)/cups/.*
@@ -145,6 +146,17 @@
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibz1
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2
 
+# Just docs
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-banner.html
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-cups.html
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-httpipp.html
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-ppd.html
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/translation.html
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/options.html
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html
+CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/network.html
+
 PACKAGES += CSWcupsclient
 SPKG_DESC_CSWcupsclient = CUPS client binaries
 PKGFILES_CSWcupsclient  = $(sbindir)/(accept|reject|cups(addsmb|ctl|(en|dis)able))
@@ -186,7 +198,6 @@
 PKGFILES_CSWcups-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWcups-dev += $(datadir)/cups/ppdc.*
 PKGFILES_CSWcups-dev += $(datadir)/cups/drv.*
-PKGFILES_CSWcups-dev += $(datadir)/doc/cups/.*
 PKGFILES_CSWcups-dev += $(datadir)/cups/examples.*
 # The development package needs all the libraries
 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsppdc1
@@ -199,17 +210,6 @@
 OBSOLETED_BY_CSWcups-dev += CSWcupsdev
 OBSOLETED_BY_CSWcups-dev += CSWcupsdoc
 
-# Just docs
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-banner.html
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-cups.html
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/api-httpipp.html
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-ppd.html
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/translation.html
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/options.html
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/ref-cupsd-conf.html
-CHECKPKG_OVERRIDES_CSWcups-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cups/help/network.html
-
 # The problematic cupslinks package
 # PACKAGES += CSWcupslinks
 CATALOGNAME_CSWcupslinks = cups_links

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