[Pkg-cups-devel] r696 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Fri Mar  7 20:52:30 2008
New Revision: 696

Log:
* debian/patches/pdftops-cups-1.4.dpatch: Apply patch from Alban Browaeys to
  support custom page sizes in pdftops. Forwarded to STR#2744.
  (Closes: #469730)

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Fri Mar  7 20:52:30 2008
@@ -2,8 +2,11 @@
 
   * debian/rules: Configure with default log file permissions 0640.
     (Closes: #469853)
+  * debian/patches/pdftops-cups-1.4.dpatch: Apply patch from Alban Browaeys to
+    support custom page sizes in pdftops. Forwarded to STR#2744.
+    (Closes: #469730)
 
- -- Martin Pitt <mpitt at debian.org>  Fri, 07 Mar 2008 21:43:54 +0100
+ -- Martin Pitt <mpitt at debian.org>  Fri, 07 Mar 2008 21:51:37 +0100
 
 cupsys (1.3.6-1) unstable; urgency=low
 

Modified: cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch	(original)
+++ cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch	Fri Mar  7 20:52:30 2008
@@ -2,12 +2,13 @@
 ## pdftops-cups-1.4.dpatch by  <till.kamppeter at gmail.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: pdftops from cups 1.4 trunk, plus patch to allow custom page sizes
+## DP: (from #469730, STR #2744)
 
 @DPATCH@
-diff -urNad cupsys-1.3.5~/filter/Makefile cupsys-1.3.5/filter/Makefile
---- cupsys-1.3.5~/filter/Makefile	2007-07-20 01:27:49.000000000 +0200
-+++ cupsys-1.3.5/filter/Makefile	2008-02-23 17:02:03.000000000 +0100
+diff -urNad trunk~/filter/Makefile trunk/filter/Makefile
+--- trunk~/filter/Makefile	2008-03-07 21:40:55.000000000 +0100
++++ trunk/filter/Makefile	2008-03-07 21:49:17.000000000 +0100
 @@ -19,7 +19,7 @@
  
  
@@ -36,10 +37,10 @@
  
  #
  # rastertolabel
-diff -urNad cupsys-1.3.5~/filter/pdftops.c cupsys-1.3.5/filter/pdftops.c
---- cupsys-1.3.5~/filter/pdftops.c	1970-01-01 01:00:00.000000000 +0100
-+++ cupsys-1.3.5/filter/pdftops.c	2008-02-23 17:02:09.000000000 +0100
-@@ -0,0 +1,314 @@
+diff -urNad trunk~/filter/pdftops.c trunk/filter/pdftops.c
+--- trunk~/filter/pdftops.c	1970-01-01 01:00:00.000000000 +0100
++++ trunk/filter/pdftops.c	2008-03-07 21:49:44.000000000 +0100
+@@ -0,0 +1,317 @@
 +/*
 + * "$Id$"
 + *
@@ -220,7 +221,10 @@
 +    * Set output page size...
 +    */
 +
-+    size = ppdPageSize(ppd, NULL);
++    if ((val = cupsGetOption("PageSize", num_options, options)) != NULL)
++      size = ppdPageSize(ppd, val);
++    else
++      size = ppdPageSize(ppd, NULL);
 +    if (size)
 +    {
 +     /*