From 2c3190e848120a35a36531b475a53b81e38335cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 23 Aug 2014 07:10:50 +0200
Subject: Add patch to remove trailing whitespaces on ppd files.

---
 debian/changelog                                  |  9 +++++++++
 debian/control                                    | 20 +++++++++----------
 debian/patches/0010-ppd_trailing_whitespace.patch | 24 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 4 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 debian/patches/0010-ppd_trailing_whitespace.patch

diff --git a/debian/changelog b/debian/changelog
index 435405d..f71bf89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+foomatic-filters (4.0.17-5) unstable; urgency=medium
+
+  * New debian/patches/0010-ppd_trailing_whitespace.patch:
+    - remove trailing whitespace from ppd files (Closes: #758133)
+  * debian/control:
+    - Change Vcs-Browser to cgit.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 23 Aug 2014 05:59:35 +0200
+
 foomatic-filters (4.0.17-4) unstable; urgency=medium
 
   * pdf.h
diff --git a/debian/control b/debian/control
index 8fff273..0506d8b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: text
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Build-Depends: 
- debhelper (>= 9), 
+ debhelper (>= 9),
  libcups2-dev,
  libdbus-1-dev,
- perl, 
- pkg-config, 
- po-debconf 
+ perl,
+ pkg-config,
+ po-debconf
 Homepage: http://www.openprinting.org/
 Vcs-Git: git://anonscm.debian.org/collab-maint/foomatic-filters.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/foomatic-filters.git
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/foomatic-filters.git
 Standards-Version: 3.9.5
 
 Package: foomatic-filters
@@ -19,11 +19,11 @@ Architecture: any
 Pre-Depends: bash (>= 2.05)
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, ucf (>= 0.30)
 Recommends:
-    cups-client | lpr | lprng | rlpr,
-    ghostscript,
-    cups | enscript | a2ps | mpage,
-    poppler-utils (>= 0.11.2),
-    colord
+ cups-client | lpr | lprng | rlpr,
+ ghostscript,
+ cups | enscript | a2ps | mpage,
+ poppler-utils (>= 0.11.2),
+ colord
 Breaks: foomatic-bin (<< 2.9), cupsomatic-ppd (<< 20030507)
 Replaces: foomatic-bin (<< 2.9), cupsomatic-ppd
 Description: OpenPrinting printer support - filters
diff --git a/debian/patches/0010-ppd_trailing_whitespace.patch b/debian/patches/0010-ppd_trailing_whitespace.patch
new file mode 100644
index 0000000..7efd6ac
--- /dev/null
+++ b/debian/patches/0010-ppd_trailing_whitespace.patch
@@ -0,0 +1,24 @@
+Description: remove trailing whitespaces from ppd files
+ Remove trailing whitespaces from ppd file to prevent segfault
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug: https://bugs.linuxfoundation.org/show_bug.cgi?id=1227
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758133
+Forwarded: https://bugs.linuxfoundation.org/show_bug.cgi?id=1227
+Last-Update: 2014-08-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/options.c
+===================================================================
+--- trunk.orig/options.c	2014-08-17 09:56:36.990949026 +0200
++++ trunk/options.c	2014-08-17 09:59:43.750779956 +0200
+@@ -1628,6 +1628,10 @@
+         /* remove last newline */
+         dstrremovenewline(value);
+ 
++        /* remove last whitespace */
++        /* new 2014-08-17         */
++        dstrtrim_right(value);
++
+         /* process key/value pairs */
+         if (strcmp(key, "NickName") == 0) {
+             unhtmlify(printer_model, 256, value->data);
diff --git a/debian/patches/series b/debian/patches/series
index 2ea9c4c..3cea5ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0010-ppd_trailing_whitespace.patch
 0002-pdf_header.patch
 0001-spelling-errors.diff
 fixed-segfault-when-creating-logfile.patch
-- 
cgit v1.2.3