merge patched-debian/experimental into debian/experimental

34 files changed, 112 insertions, 56 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 11a4b11ef..abbae7578 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-fc775e5a6f0f92448f0ca2a11a20c93a032e93c9
-fc775e5a6f0f92448f0ca2a11a20c93a032e93c9
+9a16a75e6195487a384423e157673585d9744b42
+9a16a75e6195487a384423e157673585d9744b42
 0450ddd4f003de8aa8d8e7a54d181a992607d031
 0450ddd4f003de8aa8d8e7a54d181a992607d031
 cups_2.3~b8.orig.tar.gz
diff --git a/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
index c7879697d..1496b9dd9 100644
--- a/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+++ b/debian/patches/0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -1,4 +1,4 @@
-From dc4aa9516f62cc7d2d412072fc2415e0eb067e99 Mon Sep 17 00:00:00 2001
+From c7d2479482048b92d177c28c53fc80749fe94c6e Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:30 +0200
 Subject: Let snmp backend also use manufacturer-specific MIBs
diff --git a/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0034-Build-mantohtml-with-the-build-architecture-compiler.patch
index fae5c9cc0..bd2fafd35 100644
--- a/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch
+++ b/debian/patches/0034-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -1,4 +1,4 @@
-From 51096b6b67eee649bfea795f2fc9d552bb4734ef Mon Sep 17 00:00:00 2001
+From adacfa16d130f6e32f901a0cc664156587745ef9 Mon Sep 17 00:00:00 2001
 From: Helmut Grohne <helmut@subdivi.de>
 Date: Tue, 9 Aug 2016 18:11:49 +0200
 Subject: Build mantohtml with the build architecture compiler
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
index 97777ec33..243c6aa34 100644
--- a/debian/patches/airprint-support.patch
+++ b/debian/patches/airprint-support.patch
@@ -1,4 +1,4 @@
-From f83e146d4844d023c2c4d26dd499292678cca3eb Mon Sep 17 00:00:00 2001
+From 5dc550723e711d5ad8eede56543b058b2d04a5f3 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:29 +0200
 Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
index d9934e451..f776e0a7f 100644
--- a/debian/patches/confdirperms.patch
+++ b/debian/patches/confdirperms.patch
@@ -1,4 +1,4 @@
-From add1f9d557836e0c235abf017d8ac33bb7b31620 Mon Sep 17 00:00:00 2001
+From a170a5718c91a51dfc2ae122d9be8a8e61e06784 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:41 +0200
 Subject: Do not mess with the permissions of cupsd.conf.
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch
index 272206d23..2a30f38a4 100644
--- a/debian/patches/cups-set-default-error-policy-retry-job.patch
+++ b/debian/patches/cups-set-default-error-policy-retry-job.patch
@@ -1,4 +1,4 @@
-From 9d057eaabc86e56a6895c4a3dc900245928d2768 Mon Sep 17 00:00:00 2001
+From 79c98928ef373d5db7097b25d1bd7745f3dd1b5a Mon Sep 17 00:00:00 2001
 From: Martin Pitt <martin.pitt@ubuntu.com>
 Date: Tue, 9 Aug 2016 18:11:47 +0200
 Subject: Set default job error policy to "retry-job", since it is less
diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
index eb40027bc..770e10cf0 100644
--- a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
+++ b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
@@ -1,4 +1,4 @@
-From 700d1fcf02465abcca21092960f07d01d9e9094d Mon Sep 17 00:00:00 2001
+From ea4f9320dfa51cb939e3a8c24ee0a182e2720817 Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:46 +0200
 Subject: Set the default for SyncOnClose to Yes
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
index d12058c15..0855afa89 100644
--- a/debian/patches/debianize_cups-config.patch
+++ b/debian/patches/debianize_cups-config.patch
@@ -1,4 +1,4 @@
-From 5a4fa1e305c22cdda5ab8de2f02d4f87cae4f4b5 Mon Sep 17 00:00:00 2001
+From e6b6427e190e1adebbd01991ef7f4f5813ee83a5 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:49 +0200
 Subject: Use dpkg-architecture in cups-config to make it
diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch
index d684f40a6..24a300a83 100644
--- a/debian/patches/default_log_settings.patch
+++ b/debian/patches/default_log_settings.patch
@@ -1,4 +1,4 @@
-From 73fd59f780f09aa972f5aec45d8c84831cf20b6d Mon Sep 17 00:00:00 2001
+From f4da0001086bf720ebf6687ea419bbce9a1f4200 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:40 +0200
 Subject: Deactivate CUPS' own log rotating as the system already provides a
diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch
index 7430c4903..a79d02631 100644
--- a/debian/patches/do-not-broadcast-with-hostnames.patch
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -1,4 +1,4 @@
-From f00fe3a146439c3c77f1d8ff610313f5559ed31e Mon Sep 17 00:00:00 2001
+From 5717ff09f09b2b45f4258eca978d573e0a7d481c Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:35 +0200
 Subject: Do not use host names for broadcasting print queues and
diff --git a/debian/patches/log-debug-history-nearly-unlimited.patch b/debian/patches/log-debug-history-nearly-unlimited.patch
index 8bf3ea984..4e4b38a5e 100644
--- a/debian/patches/log-debug-history-nearly-unlimited.patch
+++ b/debian/patches/log-debug-history-nearly-unlimited.patch
@@ -1,4 +1,4 @@
-From 7868a0d172ec72a41b4a892fcac5784c85a9d24e Mon Sep 17 00:00:00 2001
+From 79eed617a879d047f7f8a6ae9bbecd28bbdbc6cd Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:45 +0200
 Subject: Make log debug history nearly unlimited
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
index c227df3fa..ed5186c3c 100644
--- a/debian/patches/logfiles_adm_readable.patch
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -1,4 +1,4 @@
-From 6efd709f1c5ebe5a87d6403444e24543e05dfcc7 Mon Sep 17 00:00:00 2001
+From 936187bae112bf5415852825e773937f20630f52 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:38 +0200
 Subject: Make log files readable to group "adm", if present.
diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch
index 9c9ce55f4..70155e910 100644
--- a/debian/patches/man-cups-lpd-drop-dangling-references.patch
+++ b/debian/patches/man-cups-lpd-drop-dangling-references.patch
@@ -1,4 +1,4 @@
-From acc4494afa9dff8c4b6801c2982e1bfe755caaf3 Mon Sep 17 00:00:00 2001
+From 53cd557996e42b4f072484b024fff123066a5034 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
 Date: Tue, 9 Aug 2016 18:11:48 +0200
 Subject: Drop dangling references from cups-lpd.man
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
index 412ec2c34..98d31bc0a 100644
--- a/debian/patches/manpage-translations.patch
+++ b/debian/patches/manpage-translations.patch
@@ -1,4 +1,4 @@
-From fc775e5a6f0f92448f0ca2a11a20c93a032e93c9 Mon Sep 17 00:00:00 2001
+From 9a16a75e6195487a384423e157673585d9744b42 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:50 +0200
 Subject: po4a infrastructure and translations for manpages.
diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch
index e0b21ab74..bfc6386b1 100644
--- a/debian/patches/move-cupsd-conf-default-to-share.patch
+++ b/debian/patches/move-cupsd-conf-default-to-share.patch
@@ -1,4 +1,4 @@
-From fa343565c53cacb148bcfaaee3249eb8ca5e51cc Mon Sep 17 00:00:00 2001
+From bfc4c5409bd72c49eac5c35bd95f0d90a58204d0 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:24 +0200
 Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
index bdb9d73c0..4273f3c33 100644
--- a/debian/patches/no-conffile-timestamp.patch
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -1,4 +1,4 @@
-From c0965afd3a25dac40af3c81ce07f0d3ec9f536ae Mon Sep 17 00:00:00 2001
+From 76762601727cf67a7ba90b5d6f8c98c0403fed81 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joeyh@debian.org>
 Date: Tue, 9 Aug 2016 18:11:31 +0200
 Subject: Disable time stamps in conffiles, to avoid ever-changing files in
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
index cea2047c8..d7a25f399 100644
--- a/debian/patches/reactivate_recommended_driver.patch
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -1,4 +1,4 @@
-From 6da4266ba23291298cdaaf878738727c24482690 Mon Sep 17 00:00:00 2001
+From 1be942dea723fc4e9b83c19712960e39b91b8cba Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:36 +0200
 Subject: CUPS removes the "(recommended)" comments of the NickNames of
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
index ddffc4816..4894b452c 100644
--- a/debian/patches/removecvstag.patch
+++ b/debian/patches/removecvstag.patch
@@ -1,4 +1,4 @@
-From 6a01ba1557ddbfb839b77649df982a06051614a0 Mon Sep 17 00:00:00 2001
+From bfa36b7d15bca23c2aafc2910692fc2467df42d4 Mon Sep 17 00:00:00 2001
 From: Kenshi Muto <kmuto@debian.org>
 Date: Tue, 9 Aug 2016 18:11:33 +0200
 Subject: Do not write VCS tags into installed conffiles
diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch
index a8f8c6314..e28f920c3 100644
--- a/debian/patches/rename-systemd-units.patch
+++ b/debian/patches/rename-systemd-units.patch
@@ -1,4 +1,4 @@
-From afbeed89693cea6037dbc1ca46b04708597fa428 Mon Sep 17 00:00:00 2001
+From 4df1b79e0fe31a3a36d902606b7ef2f57032c5e5 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:34 +0200
 Subject: Rename the systemd service file from org.cups.cups.* to cups.*
diff --git a/debian/patches/series b/debian/patches/series
index 337ebd7f5..6992e5f0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ pwg-raster-attributes.patch
 manpage-hyphen-minus.patch
 0003-Install-root-backends-world-readable.patch
 fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+tests-fix-topdf-filter-paths.patch
 tests-ignore-warnings.patch
 tests-ignore-usb-crash.patch
 tests-ignore-kfreebsd-amd64-not-a-pdf.patch
@@ -15,7 +16,7 @@ tests-make-lpstat-call-reproducible.patch
 tests-no-pdftourf.patch
 move-cupsd-conf-default-to-share.patch
 airprint-support.patch
-0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 no-conffile-timestamp.patch
 removecvstag.patch
 rename-systemd-units.patch
@@ -30,5 +31,5 @@ cupsd-set-default-for-SyncOnClose-to-Yes.patch
 cups-set-default-error-policy-retry-job.patch
 man-cups-lpd-drop-dangling-references.patch
 debianize_cups-config.patch
-0033-Build-mantohtml-with-the-build-architecture-compiler.patch
+0034-Build-mantohtml-with-the-build-architecture-compiler.patch
 manpage-translations.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
index 7fcd76663..5753044c0 100644
--- a/debian/patches/show-compile-command-lines.patch
+++ b/debian/patches/show-compile-command-lines.patch
@@ -1,4 +1,4 @@
-From f65476c14197d5fee37ccd3c2ac64bf74bc69532 Mon Sep 17 00:00:00 2001
+From 5b651b291af01d37ccae44a8f470c8b9c74f08bd Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:43 +0200
 Subject: Show compile command lines
diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch
index 733ea74e1..a47ded128 100644
--- a/debian/patches/test-i18n-nonlinux.patch
+++ b/debian/patches/test-i18n-nonlinux.patch
@@ -1,4 +1,4 @@
-From cbbf16b4bfa904c6cacf7d3fac51795a673f3434 Mon Sep 17 00:00:00 2001
+From 5bc6801651370bc1b5ae09df4e9ec6531f514bf2 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:16 +0200
 Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
index 164138e14..3c59daef0 100644
--- a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
+++ b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
@@ -1,4 +1,4 @@
-From b2a0fef331260dc596caed9995f555ff8ed55481 Mon Sep 17 00:00:00 2001
+From 0ea5a8e2614023c3fa0c02c312064c948d099ae5 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:18 +0200
 Subject: Tests: Force LC_* environment variables when testing (non)
diff --git a/debian/patches/tests-fix-topdf-filter-paths.patch b/debian/patches/tests-fix-topdf-filter-paths.patch
new file mode 100644
index 000000000..c2a226f05
--- /dev/null
+++ b/debian/patches/tests-fix-topdf-filter-paths.patch
@@ -0,0 +1,55 @@
+From 7142734671f89e1fb278e8ac6e52b8d93cc93360 Mon Sep 17 00:00:00 2001
+From: Didier Raboud <odyx@debian.org>
+Date: Wed, 8 May 2019 14:42:00 +0200
+Subject: Tests: Fix *topdf filter to find the test files in their right paths
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/pull/5577
+Patch-Name: tests-fix-topdf-filter-paths.patch
+---
+ test/run-stp-tests.sh | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 64322d68c..2f9630f52 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -396,10 +396,10 @@ trap "" PIPE
+ gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
+ case "\$5" in
+ 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
+-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4.pdf"
++		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4.pdf"
+ 		;;
+ 	*)
+-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter.pdf"
++		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter.pdf"
+ 		;;
+ esac
+ EOF
+@@ -413,10 +413,10 @@ trap "" PIPE
+ gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
+ case "\$5" in
+ 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
+-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4.ps"
++		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4.ps"
+ 		;;
+ 	*)
+-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter.ps"
++		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter.ps"
+ 		;;
+ esac
+ EOF
+@@ -430,10 +430,10 @@ trap "" PIPE
+ gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
+ case "\$5" in
+ 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
+-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4-300-black-1.pwg.gz"
++		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4-300-black-1.pwg"
+ 		;;
+ 	*)
+-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter-300-black-1.pwg.gz"
++		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter-300-black-1.pwg"
+ 		;;
+ esac
+ EOF
diff --git a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
index e4069d71a..6e0ba394a 100644
--- a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
+++ b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
@@ -1,4 +1,4 @@
-From c5cbc65c080f3267ff07849549b5f42817f022c2 Mon Sep 17 00:00:00 2001
+From 6cc04d7742256d489756d0abdb9960d9a2d0130a Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:33:56 +0200
 Subject: Tests: ignore errors triggered on ipv6-deprived hosts
@@ -13,7 +13,7 @@ Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index ff1003eae..4c11f0a99 100755
+index f5a98dd64..f3a432155 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
diff --git a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
index f509a3859..a2ac82c66 100644
--- a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+++ b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
@@ -1,4 +1,4 @@
-From dfd50d856ce36ad8b4040b1a4cb270fe9aa7a18c Mon Sep 17 00:00:00 2001
+From 558fa41599f6e8d3f35aa6de9a0463d7beec24ce Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:30:48 +0200
 Subject: Tests: ignore loadFile failures
@@ -13,7 +13,7 @@ Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
  1 file changed, 2 insertions(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 09eb97afe..ff1003eae 100755
+index 8bde425d6..f5a98dd64 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1028,6 +1028,8 @@ fi
diff --git a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
index ae315508e..1db3cc759 100644
--- a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+++ b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
@@ -1,4 +1,4 @@
-From 9d6ae5f0d8cc78a7fad136c38f3da949baa9a8c3 Mon Sep 17 00:00:00 2001
+From e2010932abe1c3274148abebbf428ff351817e5e Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:36:02 +0200
 Subject: Tests: ignore the failure to write uncompressed data
@@ -14,7 +14,7 @@ Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 4c11f0a99..4f74dbad3 100755
+index f3a432155..c072ad88d 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
index 09c1c98ea..163bd9414 100644
--- a/debian/patches/tests-ignore-usb-crash.patch
+++ b/debian/patches/tests-ignore-usb-crash.patch
@@ -1,4 +1,4 @@
-From b44788365f6c41641d594de09d22faee3402df47 Mon Sep 17 00:00:00 2001
+From 54469f85529074f5e4efe178bc4b684bd7934c60 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:10 +0200
 Subject: Tests: ignore usb & dnssd backend unexpected exits
@@ -17,7 +17,7 @@ Patch-Name: tests-ignore-usb-crash.patch
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 4905b726e..09eb97afe 100755
+index a60158156..8bde425d6 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1025,7 +1025,10 @@ else
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
index 7c65e8947..b48976c9e 100644
--- a/debian/patches/tests-ignore-warnings.patch
+++ b/debian/patches/tests-ignore-warnings.patch
@@ -1,4 +1,4 @@
-From 625b3fd3961894f7e261306b26b768af59ee022b Mon Sep 17 00:00:00 2001
+From a6ac323440f3b012ab60b26bf64711df6982db51 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:09 +0200
 Subject: Tests: Ignore warnings from colord and Avahi
@@ -13,7 +13,7 @@ Patch-Name: tests-ignore-warnings.patch
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 64322d68c..4905b726e 100755
+index 2f9630f52..a60158156 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -1040,7 +1040,11 @@ else
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
index 0943e2bcf..225d1e5ce 100644
--- a/debian/patches/tests-make-lpstat-call-reproducible.patch
+++ b/debian/patches/tests-make-lpstat-call-reproducible.patch
@@ -1,10 +1,10 @@
-From e0ac591abb9d3fa2580bf06aad52ef5cfdc7bff5 Mon Sep 17 00:00:00 2001
+From 72ff06eb3de1f2205f2e0210e86cdb8fccdb84dc Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:22 +0200
-Subject: Force LC_ALL=C environment variable when grepping the output of
- lpstat.
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
 
- Permits testing in non-"C" environments.
+Permits testing in non-"C" environments.
 Origin: vendor
 Last-Update: 2016-07-11
 Patch-Name: tests-make-lpstat-call-reproducible.patch
@@ -13,7 +13,7 @@ Patch-Name: tests-make-lpstat-call-reproducible.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 6d6aaef9c..8c70f3e27 100755
+index 3f0becde9..baebdeec9 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
index d3dd5b324..30cdd3d77 100644
--- a/debian/patches/tests-no-pdftourf.patch
+++ b/debian/patches/tests-no-pdftourf.patch
@@ -1,4 +1,4 @@
-From b468f9abec57a8ad71956c59e3fb59c68979d412 Mon Sep 17 00:00:00 2001
+From 18bcd33f91dff64d4c4d0b3f91d002cf05128226 Mon Sep 17 00:00:00 2001
 From: Michael Sweet <michael.r.sweet@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:23 +0200
 Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
@@ -18,7 +18,7 @@ Patch-Name: tests-no-pdftourf.patch
  delete mode 100644 test/test.types
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 8c70f3e27..4903484a2 100755
+index baebdeec9..001e2f61f 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -268,7 +268,7 @@ case "$usedebugprintfs" in
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
index df593407f..6f3db3cab 100644
--- a/debian/patches/tests-use-ipv4-lo-address.patch
+++ b/debian/patches/tests-use-ipv4-lo-address.patch
@@ -1,13 +1,13 @@
-From 8dbb3c94c9c3c71fc3c9e9814873b1fb5e381290 Mon Sep 17 00:00:00 2001
+From f9a39c292ab9d66fcc586c9935c0ea31b310722a Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:21 +0200
-Subject: Use 127.0.0.1 instead of localhost in the test-suite. This should
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
 
- make the test-suite work in pbuilder. It apparently also fixes an ipp backend
- problem in the test-suite.
 Origin: vendor
 Last-Update: 2016-08-05
-
 Patch-Name: tests-use-ipv4-lo-address.patch
 ---
  test/5.1-lpadmin.sh   | 4 ++--
@@ -30,7 +30,7 @@ index 7efc39892..08b8c508f 100644
  	echo "    FAILED"
  	exit 1
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 0bb955749..6d6aaef9c 100755
+index 492982005..3f0becde9 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -490,7 +490,7 @@ fi
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
index f5b9b4251..ad239e4a9 100644
--- a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
+++ b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
@@ -1,4 +1,4 @@
-From 2d92d507c03a7d7b63b3c556ed5f1372e9a6d7f5 Mon Sep 17 00:00:00 2001
+From 7c236c7079c428eb4c0b5564342463bba2ebec7a Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:17 +0200
 Subject: Tests: Make sure that all scheduled jobs are finished before
@@ -14,7 +14,7 @@ Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
  1 file changed, 5 insertions(+)
 
 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 4f74dbad3..0bb955749 100755
+index c072ad88d..492982005 100755
 --- a/test/run-stp-tests.sh
 +++ b/test/run-stp-tests.sh
 @@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 4903484a2..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -396,10 +396,10 @@ trap "" PIPE
 gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4.pdf"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4.pdf"
 		;;
 	*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter.pdf"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter.pdf"
 		;;
 esac
 EOF
@@ -413,10 +413,10 @@ trap "" PIPE
 gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4.ps"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4.ps"
 		;;
 	*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter.ps"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter.ps"
 		;;
 esac
 EOF
@@ -430,10 +430,10 @@ trap "" PIPE
 gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
 	*media=a4* | *media=iso_a4* | *PageSize=A4*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4-300-black-1.pwg.gz"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-a4-300-black-1.pwg"
 		;;
 	*)
-		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter-300-black-1.pwg.gz"
+		gziptoany "$1" "$2" "$3" "$4" "$5" "$root/examples/onepage-letter-300-black-1.pwg"
 		;;
 esac
 EOF