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

[cgrzemba at users.sourceforge.net]

Revision: 19453
          http://gar.svn.sourceforge.net/gar/?rev=19453&view=rev
Author:   cgrzemba
Date:     2012-10-16 06:18:00 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
poppler/trunk: add checkpkg override

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

Modified: csw/mgar/pkg/poppler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/poppler/trunk/Makefile	2012-10-15 14:25:26 UTC (rev 19452)
+++ csw/mgar/pkg/poppler/trunk/Makefile	2012-10-16 06:18:00 UTC (rev 19453)
@@ -6,7 +6,7 @@
 GARTYPE = v2
 
 DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base
-define BLURB
+	define BLURB
 endef
 
 SPKG_SOURCEURL = http://poppler.freedesktop.org/
@@ -80,6 +80,7 @@
 # CSWxpdf provides the same tools, but should use this package instead
 # interims solution until rework xpdf
 INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf
+# in future packages these are already excluded
 CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftohtml|CSWpdftohtml|CSWpoppler
 CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftops|CSWpoppler|CSWxpdf
 CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdfimages|CSWpoppler|CSWxpdf
@@ -93,6 +94,7 @@
 CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftops.1|CSWpoppler|CSWxpdf
 CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftotext.1|CSWpoppler|CSWxpdf
 CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdffonts.1|CSWpoppler|CSWxpdf
+CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftohtml.1|CSWpdftohtml|CSWpoppler
 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler7
 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpng12-0
 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6

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