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

[Luca Capello]

Author: gismo
Date: 2011-02-19 17:03:13 +0000 (Sat, 19 Feb 2011)
New Revision: 260

Modified:
   trunk/foo2zjs_20100728dfsg/debian/changelog
   trunk/foo2zjs_20100728dfsg/debian/patches/20-honour-papersize.patch
   trunk/foo2zjs_20100728dfsg/debian/patches/series
   trunk/foo2zjs_20100728dfsg/debian/rules
Log:
debian/rules: add /etc/papersize support

Modified: trunk/foo2zjs_20100728dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20100728dfsg/debian/changelog	2011-02-18 14:56:05 UTC (rev 259)
+++ trunk/foo2zjs_20100728dfsg/debian/changelog	2011-02-19 17:03:13 UTC (rev 260)
@@ -12,6 +12,12 @@
     - remove, upstream now ships a different version.
   * debian/manpages:
     - remove, now useless.
+  * debian/patches/series: update.
+  * 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/rules:
+    + add pointer to the patch above.
 
   [ Till Kamppeter ]
   * Merge from Ubuntu maverick.
@@ -37,6 +43,7 @@
   * debian/rules:
     + Add "CUPS_SERVERBIN=..." to the "make install" command line.
     + Add "*cupsFilter" line to accept PDF input data to the PPDs.
+    + Add /etc/papersize support.
     + Add useful comments.
     + Correct upstream link to the CUPS filter.
     + Install additional PPDs and compress them.

Modified: trunk/foo2zjs_20100728dfsg/debian/patches/20-honour-papersize.patch
===================================================================
--- trunk/foo2zjs_20100728dfsg/debian/patches/20-honour-papersize.patch	2011-02-18 14:56:05 UTC (rev 259)
+++ trunk/foo2zjs_20100728dfsg/debian/patches/20-honour-papersize.patch	2011-02-19 17:03:13 UTC (rev 260)
@@ -1,4 +1,9 @@
 Support /etc/papersize
+
+NB, this is now done in debian/rules, so it will automatically apply to
+    every new wrapper script 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_20100728.orig/foo2hp2600-wrapper.in
 +++ foo2zjs_20100728/foo2hp2600-wrapper.in
 @@ -204,7 +204,8 @@

Modified: trunk/foo2zjs_20100728dfsg/debian/patches/series
===================================================================
--- trunk/foo2zjs_20100728dfsg/debian/patches/series	2011-02-18 14:56:05 UTC (rev 259)
+++ trunk/foo2zjs_20100728dfsg/debian/patches/series	2011-02-19 17:03:13 UTC (rev 260)
@@ -1,5 +1,4 @@
 10-makefile.patch
-20-honour-papersize.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-18 14:56:05 UTC (rev 259)
+++ trunk/foo2zjs_20100728dfsg/debian/rules	2011-02-19 17:03:13 UTC (rev 260)
@@ -75,6 +75,11 @@
 	  find -name '*.ppd' | xargs perl -p -i -e 's,^\*cupsFilter:\s*\"application/vnd.cups-postscript\s+0\s+foomatic-rip\",*cupsFilter: "application/vnd.cups-postscript 100 foomatic-rip"\n*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip",'; \
 	  find -name '*.ppd' | xargs gzip -9 \
 	)
+	### patches/20-honour-papersize.patch
+	# Add support for /etc/papersize to all wrapper scripts. In contrary
+	# to a patch this will automatically apply to every new wrapper script
+	# which gets added to this package in the future.
+	perl -p -i -e 's/^PAPER=(\d+)\s*$$/test -r \/etc\/papersize && PAPER=\x24\(cat \/etc\/papersize\)\ntest "\x24PAPER" || PAPER=\1\n/' $(CURDIR)/debian/foo2zjs/usr/bin/*-wrapper
 
 # Build architecture-independent files here.
 binary-indep: build install