Make sure the patch is applied

3 files changed, 53 insertions, 47 deletions

diff --git a/debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch b/debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch
index 720cf50..6e8edd8 100644
--- a/debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch
+++ b/debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch
@@ -1,6 +1,7 @@
-diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//ChangeLog foomatic-filters-4.0.4.new//ChangeLog
---- foomatic-filters-4.0.4//ChangeLog	2010-02-15 13:57:40.000000000 +0100
-+++ foomatic-filters-4.0.4.new//ChangeLog	2010-06-08 17:19:38.201710562 +0200
+Index: foomatic-filters/ChangeLog
+===================================================================
+--- foomatic-filters.orig/ChangeLog	2010-07-19 16:40:10.000000000 +0200
++++ foomatic-filters/ChangeLog	2010-07-25 16:08:04.000000000 +0200
 @@ -1,3 +1,32 @@
 +2010-06-08  Till Kamppeter <till.kamppeter@gmail.com>
 +
@@ -34,9 +35,38 @@ diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//ChangeLog foomatic-filters
  2010-02-15  Till Kamppeter <till.kamppeter@gmail.com>
  
  	* Tagged branch for release 4.0.4.
-diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//foomaticrip.c foomatic-filters-4.0.4.new//foomaticrip.c
---- foomatic-filters-4.0.4//foomaticrip.c	2010-02-15 13:57:40.000000000 +0100
-+++ foomatic-filters-4.0.4.new//foomaticrip.c	2010-06-08 17:19:38.201710562 +0200
+Index: foomatic-filters/USAGE
+===================================================================
+--- foomatic-filters.orig/USAGE	2010-07-19 16:40:10.000000000 +0200
++++ foomatic-filters/USAGE	2010-07-25 16:08:04.000000000 +0200
+@@ -74,9 +74,8 @@
+ Foomatic runs on all systems where one can run the Perl
+ interpreter and Ghostscript.
+ 
+-foomatic-filters needs the Ghostscript library for foomatic-rip and
+-the Perl interpreter for beh (Backend Error Handler) and the test
+-suite.
++foomatic-filters needs the Perl interpreter for beh (Backend Error
++Handler) and the test suite.
+ 
+ To build foomatic-rip you need a C compiler and its standard libraries.
+ 
+@@ -138,9 +137,8 @@
+ a normal user.
+ 
+ The "configure" script will auto-detect where the programs have to be
+-installed and where the Perl interpreter and the Ghostscript library
+-are located. If "configure" fails because of something not being
+-installed, do
++installed and where the Perl interpreter is located. If "configure"
++fails because of something not being installed, do
+ 
+    rm -rf config.cache autom*.cache
+ 
+Index: foomatic-filters/foomaticrip.c
+===================================================================
+--- foomatic-filters.orig/foomaticrip.c	2010-07-19 16:40:10.000000000 +0200
++++ foomatic-filters/foomaticrip.c	2010-07-25 16:08:04.000000000 +0200
 @@ -1602,7 +1602,8 @@
             PostScript file (all before the first page begins). */
          optionset_copy_values(optionset("userval"), optionset("header"));
@@ -55,9 +85,10 @@ diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//foomaticrip.c foomatic-fil
 +    return EXIT_PRINTED;
  }
  
-diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//foomaticrip.h foomatic-filters-4.0.4.new//foomaticrip.h
---- foomatic-filters-4.0.4//foomaticrip.h	2010-02-15 13:57:40.000000000 +0100
-+++ foomatic-filters-4.0.4.new//foomaticrip.h	2010-06-08 17:19:38.201710562 +0200
+Index: foomatic-filters/foomaticrip.h
+===================================================================
+--- foomatic-filters.orig/foomaticrip.h	2010-07-19 16:40:10.000000000 +0200
++++ foomatic-filters/foomaticrip.h	2010-07-25 16:08:04.000000000 +0200
 @@ -56,7 +56,7 @@
  #define EXIT_JOBERR 3                           /* job is defective */
  #define EXIT_SIGNAL 4                           /* terminated after catching signal */
@@ -67,9 +98,10 @@ diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//foomaticrip.h foomatic-fil
  #define EXIT_PRNERR_NORETRY_ACCESS_DENIED 7     /* bad password? bad port permissions? */
  #define EXIT_PRNERR_NOT_RESPONDING 8            /* just doesn't answer at all (turned off?) */
  #define EXIT_PRNERR_NORETRY_BAD_SETTINGS 9      /* interface settings are invalid */
-diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//options.c foomatic-filters-4.0.4.new//options.c
---- foomatic-filters-4.0.4//options.c	2010-02-15 13:57:40.000000000 +0100
-+++ foomatic-filters-4.0.4.new//options.c	2010-06-08 17:19:38.211630380 +0200
+Index: foomatic-filters/options.c
+===================================================================
+--- foomatic-filters.orig/options.c	2010-07-19 16:40:10.000000000 +0200
++++ foomatic-filters/options.c	2010-07-25 16:08:04.000000000 +0200
 @@ -34,10 +34,10 @@
  
  /* Values from foomatic keywords in the ppd file */
@@ -124,9 +156,10 @@ diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//options.c foomatic-filters
          return 1;
      }
  
-diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//options.h foomatic-filters-4.0.4.new//options.h
---- foomatic-filters-4.0.4//options.h	2010-02-15 13:57:40.000000000 +0100
-+++ foomatic-filters-4.0.4.new//options.h	2010-06-08 17:19:38.211630380 +0200
+Index: foomatic-filters/options.h
+===================================================================
+--- foomatic-filters.orig/options.h	2010-07-19 16:40:10.000000000 +0200
++++ foomatic-filters/options.h	2010-07-25 16:08:04.000000000 +0200
 @@ -55,7 +55,7 @@
  typedef struct choice_s {
      char value [128];
@@ -147,9 +180,10 @@ diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//options.h foomatic-filters
  
  extern int ps_accounting;
  
-diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//pdf.c foomatic-filters-4.0.4.new//pdf.c
---- foomatic-filters-4.0.4//pdf.c	2010-02-15 13:57:40.000000000 +0100
-+++ foomatic-filters-4.0.4.new//pdf.c	2010-06-08 17:19:38.211630380 +0200
+Index: foomatic-filters/pdf.c
+===================================================================
+--- foomatic-filters.orig/pdf.c	2010-07-19 16:40:10.000000000 +0200
++++ foomatic-filters/pdf.c	2010-07-25 16:08:04.000000000 +0200
 @@ -52,10 +52,8 @@
  	     gspath, filename);
  
@@ -212,30 +246,3 @@ diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//pdf.c foomatic-filters-4.0
      _log("File contains %d pages\n", page_count);
  
      optionset_copy_values(optionset("header"), optionset("currentpage"));
-diff -Nur -x '*.orig' -x '*~' foomatic-filters-4.0.4//USAGE foomatic-filters-4.0.4.new//USAGE
---- foomatic-filters-4.0.4//USAGE	2010-02-15 13:57:40.000000000 +0100
-+++ foomatic-filters-4.0.4.new//USAGE	2010-06-08 17:19:38.201710562 +0200
-@@ -74,9 +74,8 @@
- Foomatic runs on all systems where one can run the Perl
- interpreter and Ghostscript.
- 
--foomatic-filters needs the Ghostscript library for foomatic-rip and
--the Perl interpreter for beh (Backend Error Handler) and the test
--suite.
-+foomatic-filters needs the Perl interpreter for beh (Backend Error
-+Handler) and the test suite.
- 
- To build foomatic-rip you need a C compiler and its standard libraries.
- 
-@@ -138,9 +137,8 @@
- a normal user.
- 
- The "configure" script will auto-detect where the programs have to be
--installed and where the Perl interpreter and the Ghostscript library
--are located. If "configure" fails because of something not being
--installed, do
-+installed and where the Perl interpreter is located. If "configure"
-+fails because of something not being installed, do
- 
-    rm -rf config.cache autom*.cache
- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3af16a7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch
diff --git a/debian/rules b/debian/rules
index 44621a8..81e1f00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
 derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no")
 
 %: