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

[Martin Pitt]

Author: mpitt
Date: Mon Mar 10 08:07:04 2008
New Revision: 700

Log:
back out r399, was invalid patch

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	Mon Mar 10 08:07:04 2008
@@ -2,9 +2,6 @@
 
   * 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)
   * debian/control: Mention "lpr" in the description of -bsd, for easier
     apt-cache search catching. (Closes: #426519)
   * Remove debian/NEWS, there's nothing new since Etch's release.

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	Mon Mar 10 08:07:04 2008
@@ -2,13 +2,12 @@
 ## pdftops-cups-1.4.dpatch by  <till.kamppeter at gmail.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: pdftops from cups 1.4 trunk, plus patch to allow custom page sizes
-## DP: (from #469730, STR #2744)
+## DP: No description.
 
 @DPATCH@
-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
+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
 @@ -19,7 +19,7 @@
  
  
@@ -37,10 +36,10 @@
  
  #
  # rastertolabel
-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 @@
+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 @@
 +/*
 + * "$Id$"
 + *
@@ -221,10 +220,7 @@
 +    * Set output page size...
 +    */
 +
-+    if ((val = cupsGetOption("PageSize", num_options, options)) != NULL)
-+      size = ppdPageSize(ppd, val);
-+    else
-+      size = ppdPageSize(ppd, NULL);
++    size = ppdPageSize(ppd, NULL);
 +    if (size)
 +    {
 +     /*