[Foo2zjs-commits] r262 - in trunk/foo2zjs_20100728dfsg/debian: . patches

[Luca Capello]

Author: gismo
Date: 2011-02-19 17:39:53 +0000 (Sat, 19 Feb 2011)
New Revision: 262

Added:
   trunk/foo2zjs_20100728dfsg/debian/patches/20-PDF-input-data-in-PPDs.patch
Modified:
   trunk/foo2zjs_20100728dfsg/debian/changelog
   trunk/foo2zjs_20100728dfsg/debian/patches/series
   trunk/foo2zjs_20100728dfsg/debian/rules
Log:
debian/patches/20-PDF-input-data-in-PPDs.patch: new file

Modified: trunk/foo2zjs_20100728dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20100728dfsg/debian/changelog	2011-02-19 17:19:49 UTC (rev 261)
+++ trunk/foo2zjs_20100728dfsg/debian/changelog	2011-02-19 17:39:53 UTC (rev 262)
@@ -16,8 +16,11 @@
   * debian/patches/20-honour-papersize.patch:
     + add a note that this patch is now useless, given that
       starting with this version it is done in debian/rules.
+  * debian/patches/20-PDF-input-data-in-PPDs.patch:
+    + fake patch to show differences with upstream, it is
+      done in debian/rules.
   * debian/rules:
-    + add pointer to the patch above.
+    + add pointers to the patches above.
 
   [ Till Kamppeter ]
   * Merge from Ubuntu maverick.

Added: trunk/foo2zjs_20100728dfsg/debian/patches/20-PDF-input-data-in-PPDs.patch
===================================================================
--- trunk/foo2zjs_20100728dfsg/debian/patches/20-PDF-input-data-in-PPDs.patch	                        (rev 0)
+++ trunk/foo2zjs_20100728dfsg/debian/patches/20-PDF-input-data-in-PPDs.patch	2011-02-19 17:39:53 UTC (rev 262)
@@ -0,0 +1,32 @@
+Add "*cupsFilter" line to accept PDF input data to the PPDs, see:
+
+  <https://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat>
+
+NB, this is done in debian/rules, so it will automatically apply to
+    every new PPD which gets added to this package in the future.  The
+    patch should however not be deleted, so it does show up when
+    looking at the differences with upstream.
+--- foo2zjs_20100728dfsg.orig/PPD/Generic-OAKT_Printer.ppd
++++ foo2zjs_20100728dfsg/PPD/Generic-OAKT_Printer.ppd
+@@ -33,7 +33,8 @@
+ *cupsVersion:	1.0
+ *cupsManualCopies: True
+ *cupsModelNumber:  2
+-*cupsFilter:	"application/vnd.cups-postscript 0 foomatic-rip"
++*cupsFilter: "application/vnd.cups-postscript 100 foomatic-rip"
++*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+ *%pprRIP:        foomatic-rip other
+ *ModelName:     "Generic OAKT Printer"
+ *ShortNickName: "Generic OAKT Printer foo2oak"
+--- foo2zjs_20100728dfsg.orig/PPD/Generic-ZjStream_Printer.ppd
++++ foo2zjs_20100728dfsg/PPD/Generic-ZjStream_Printer.ppd
+@@ -33,7 +33,8 @@
+ *cupsVersion:	1.0
+ *cupsManualCopies: True
+ *cupsModelNumber:  2
+-*cupsFilter:	"application/vnd.cups-postscript 0 foomatic-rip"
++*cupsFilter: "application/vnd.cups-postscript 100 foomatic-rip"
++*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip"
+ *%pprRIP:        foomatic-rip other
+ *ModelName:     "Generic ZjStream Printer"
+ *ShortNickName: "Generic ZjStre. Printer foo2zjs"

Modified: trunk/foo2zjs_20100728dfsg/debian/patches/series
===================================================================
--- trunk/foo2zjs_20100728dfsg/debian/patches/series	2011-02-19 17:19:49 UTC (rev 261)
+++ trunk/foo2zjs_20100728dfsg/debian/patches/series	2011-02-19 17:39:53 UTC (rev 262)
@@ -1,5 +1,6 @@
 10-makefile.patch
 # in debian/rules: 20-honour-papersize.patch
+# in debian/rules: 20-PDF-input-data-in-PPDs.patch
 30-udev-rules.patch
 40-desktop-encoding-correction.patch
 40-path-correction.patch

Modified: trunk/foo2zjs_20100728dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20100728dfsg/debian/rules	2011-02-19 17:19:49 UTC (rev 261)
+++ trunk/foo2zjs_20100728dfsg/debian/rules	2011-02-19 17:39:53 UTC (rev 262)
@@ -69,6 +69,7 @@
 	dh_link /usr/bin/command2foo2lava-pjl /usr/lib/cups/filter/command2foo2lava-pjl
 	# Install PPD files for additional printers
 	install -D -m 644 debian/local/*.ppd $(CURDIR)/debian/foo2zjs/usr/share/ppd/foo2zjs/
+	### patches/20-PDF-input-data-in-PPDs.patch
 	# Add "*cupsFilter" line to accept PDF input data to the PPDs and compress them
 	( cd $(CURDIR)/debian/foo2zjs/usr/share/ppd/foo2zjs; \
 	  find -name '*.ppd.gz' | xargs gunzip; \