[Pkg-cups-devel] r810 - in cupsys/trunk/debian: . local/filters/pdftoopvp

Wed Aug 6 15:52:44 UTC 2008

Author: till-guest
Date: Wed Aug  6 15:52:43 2008
New Revision: 810

Log:
Removed pdftoopvp again. It contains a complete copy of Poppler.


Removed:
   cupsys/trunk/debian/local/filters/pdftoopvp/
Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/copyright
   cupsys/trunk/debian/rules

Modified: cupsys/trunk/debian/changelog
==============================================================================

--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Wed Aug  6 15:52:43 2008
@@ -2,20 +2,20 @@
 
   [ Till Kamppeter ]
   * debian/local/filters/imagetopdf/, debian/local/filters/pdftopdf/,
-    debian/local/filters/pdftoopvp/, debian/local/filters/pdftoraster/,
+    debian/local/filters/pdftoraster/,
     debian/local/pstopdf.convs, debian/rules, debian/control, debian/copyright,
     debian/patches/pdftopdf-libpoppler3-api.dpatch:
     Introduced the first bunch of infrastructure for using PDF as standard
     print job format. Added CUPS filters imagetopdf, pstopdf, pdftopdf,
-    pdftoopvp, pdftoraster, added build dependency on libpoppler-dev, as the
-    new filters are Poppler-based. texttopdf and pdftoijs will be added soon.
+    pdftoraster, added build dependency on libpoppler-dev, as the new filters
+    are Poppler-based. texttopdf and pdftoijs will be added soon.
     All this is temporary, as the filters are planned to be added to the
     upstream package of CUPS (CUPS STR #1595).
     Note: From the original source of all the filters files with the extensions
-    *.jp and *.png were removed. They are not needed by the filters and they
-    are not accepted in the debian/ directory as they are binary files. In
-    addition, pdftopdf needs a patch because of a small change in the Poppler
-    API (debian/patches/pdftopdf-libpoppler3-api.dpatch).
+    *.jp were removed. They are not needed by the filters and they are not
+    accepted in the debian/ directory as they are binary files. In addition,
+    pdftopdf needs a patch because of a small change in the Poppler API
+    (debian/patches/pdftopdf-libpoppler3-api.dpatch).
     
   [ Martin Pitt ]
   * Add missing CVE and more verbose descriptions to security fixes to 1.3.6-1

Modified: cupsys/trunk/debian/copyright
==============================================================================
--- cupsys/trunk/debian/copyright	(original)
+++ cupsys/trunk/debian/copyright	Wed Aug  6 15:52:43 2008
@@ -195,15 +195,13 @@
 
 Copyright for additional components in this Debian package:
 
-The CUPS filters imagetopdf, pdftopdf, pdftoopvp, pdftoraster are downloaded
+The CUPS filters imagetopdf, pdftopdf, pdftoraster are downloaded
 from: http://sourceforge.jp/projects/opfc/files/
 
 Copyright: 
 
 pdftopdf: Copyright (c) 2006-2007, BBR Inc.  All rights reserved.
 
-pdftoopvp: Copyright 2005 AXE,Inc., 2007 Modified by BBR Inc.
-
 pdftoraster: Copyright (c) 2008, BBR Inc.  All rights reserved.
 
 imagetopdf:

Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules	(original)
+++ cupsys/trunk/debian/rules	Wed Aug  6 15:52:43 2008
@@ -45,7 +45,6 @@
 	# We have removed README.jp from all source trees, as it caused
 	# packaging problems. So do not try to install these files.
 	(cd debian/local/filters; perl -p -i -e 's/README.jp//g' */Makefile*)
-	(cd debian/local/filters/pdftoopvp/poppler-0.5.4;./configure --prefix=/usr --sysconfdir=/etc --disable-cairo-output --disable-poppler-glib --disable-poppler-qt --disable-poppler-qt4 --disable-gtk-test --disable-utils)
 	(cd debian/local/filters/imagetopdf;autoreconf --install;./configure --prefix=/usr --sysconfdir=/etc)
 	(cd debian/local/filters/pdftopdf;autoreconf --install;./configure --prefix=/usr --sysconfdir=/etc)
 	(cd debian/local/filters/pdftoraster;autoreconf --install;./configure --prefix=/usr --sysconfdir=/etc)
@@ -57,7 +56,6 @@
 	# Build extra filters for PDF printing workflow
 	export CFLAGS="$CFLAGS -I`pwd`"
 	export LDFLAGS="$LDFLAGS -L`pwd`/cups/"
-	(cd debian/local/filters/pdftoopvp/poppler-0.5.4;$(MAKE))
 	(cd debian/local/filters/imagetopdf;$(MAKE) imagetopdf_CFLAGS="")
 	(cd debian/local/filters/pdftopdf;$(MAKE))
 	(cd debian/local/filters/pdftoraster;$(MAKE))
@@ -66,7 +64,6 @@
 	rm -f man/client.conf.man packaging/cups.list
 	rm -f conf/mime.convs conf/snmp.conf init/org.cups.cups-lpd.plist
 	# Clean source trees of extra filters for PDF printing workflow
-	-(cd debian/local/filters/pdftoopvp/poppler-0.5.4;$(MAKE) distclean)
 	-(cd debian/local/filters/imagetopdf;$(MAKE) distclean)
 	-(cd debian/local/filters/pdftopdf;$(MAKE) distclean)
 	-(cd debian/local/filters/pdftoraster;$(MAKE) distclean)
@@ -98,18 +95,12 @@
 	fi
 
 	# Install extra filters for PDF printing workflow
-	(cd debian/local/filters/pdftoopvp/poppler-0.5.4/pdftoopvp;make install DESTDIR=$(DEB_DESTDIR))
 	(cd debian/local/filters/imagetopdf;make install DESTDIR=$(DEB_DESTDIR))
 	(cd debian/local/filters/pdftopdf;make install DESTDIR=$(DEB_DESTDIR))
 	(cd debian/local/filters/pdftoraster;make install DESTDIR=$(DEB_DESTDIR))
 	mv $(DEB_DESTDIR)/usr/share/doc/imagetopdf $(DEB_DESTDIR)/../cups/usr/share/doc/cups
 	mv $(DEB_DESTDIR)/usr/share/doc/pdftopdf $(DEB_DESTDIR)/../cups/usr/share/doc/cups
 	mv $(DEB_DESTDIR)/usr/share/doc/pdftoraster $(DEB_DESTDIR)/../cups/usr/share/doc/cups
-	install -d $(DEB_DESTDIR)/../cups/usr/share/doc/cups/pdftoopvp/examples
-	# The drivers, partially closed-source do not ship with the distro,
-	# so consider the PPDs as programming examples
-	install -m 0644 pdftoopvp/ppd/* $(DEB_DESTDIR)/../cups/usr/share/doc/cups/pdftoopvp/examples
-	install -m 0644 pdftoopvp/poppler-0.5.4/README.opvp $(DEB_DESTDIR)/../cups/usr/share/doc/cups/pdftoopvp/
 	# Move file detection and conversion rules to /usr/share/cups/mime/ so
 	# that the package manager does not consider them conffiles
 	install -d $(DEB_DESTDIR)/../cups/usr/share/cups/mime

