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

[Martin Pitt]

Author: mpitt
Date: Sun Mar 16 19:28:55 2008
New Revision: 710

Log:
* pdftops-cups-1.4.dpatch: Update pdftops location in test suite, too, so
  that it does not fail the PDF printing test. (Forwarded to STR #2759)

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	Sun Mar 16 19:28:55 2008
@@ -24,8 +24,10 @@
   * debian/rules clean: Remove test suite HTML reports.
   * Add testsuite-exit-code.dpatch: Exit with nonzero if the test suite fails,
     so that it is easier to integrate into package building.
+  * pdftops-cups-1.4.dpatch: Update pdftops location in test suite, too, so
+    that it does not fail the PDF printing test. (Forwarded to STR #2759)
 
- -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 20:04:04 +0100
+ -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 20:20:06 +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	Sun Mar 16 19:28:55 2008
@@ -2,12 +2,14 @@
 ## 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: 1.4 uses a small filter/pdftops.c wrapper instead of xpdf. Backport this
+## DP: since it generally works much better than the 1.3 current one.
+## DP: Test suite fix is http://www.cups.org/str.php?L2759
 
 @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	2007-07-20 01:27:49.000000000 +0200
++++ trunk/filter/Makefile	2008-03-16 20:18:42.000000000 +0100
 @@ -19,7 +19,7 @@
  
  
@@ -36,9 +38,9 @@
  
  #
  # 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
+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-16 20:18:42.000000000 +0100
 @@ -0,0 +1,314 @@
 +/*
 + * "$Id$"
@@ -354,3 +356,15 @@
 +/*
 + * End of "$Id$".
 + */
+diff -urNad trunk~/test/run-stp-tests.sh trunk/test/run-stp-tests.sh
+--- trunk~/test/run-stp-tests.sh	2008-03-16 20:18:42.000000000 +0100
++++ trunk/test/run-stp-tests.sh	2008-03-16 20:18:50.000000000 +0100
+@@ -238,7 +238,7 @@
+ ln -s $root/filter/rastertoepson /tmp/cups-$user/bin/filter
+ ln -s $root/filter/rastertohp /tmp/cups-$user/bin/filter
+ ln -s $root/filter/texttops /tmp/cups-$user/bin/filter
+-ln -s $root/pdftops/pdftops /tmp/cups-$user/bin/filter
++ln -s $root/filter/pdftops /tmp/cups-$user/bin/filter
+ 
+ ln -s $root/data/classified /tmp/cups-$user/share/banners
+ ln -s $root/data/confidential /tmp/cups-$user/share/banners