merge patched-debian/master into debian/master

39 files changed, 49 insertions, 52 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 5707835a3..e9b6c6439 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-f09aa3c2689c3bba08d5e0a09d9edfa2b74afc31
-f09aa3c2689c3bba08d5e0a09d9edfa2b74afc31
+ee70ef524725b8b2b2a2a4a2667dae17af343282
+ee70ef524725b8b2b2a2a4a2667dae17af343282
 25b2338346ef3abbb93ea88476887cba7b2b86f8
 25b2338346ef3abbb93ea88476887cba7b2b86f8
 cups_2.2.10.orig.tar.gz
diff --git a/debian/patches/rootbackends-worldreadable.patch b/debian/patches/0003-Install-root-backends-world-readable.patch
index d955434a1..c9c130d02 100644
--- a/debian/patches/rootbackends-worldreadable.patch
+++ b/debian/patches/0003-Install-root-backends-world-readable.patch
@@ -1,18 +1,15 @@
-From 692052ecb4613762a4b5f09953333ab0c08b5b46 Mon Sep 17 00:00:00 2001
+From ee92595c22b31cabc5a53268803fc8e53db14813 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:06 +0200
-Subject: Install root backends world-readable.
+Subject: Install root backends world-readable
 
 This is needed:
  - to comply with Debian Policy
- - because it is both nonsensical to to not do so
+ - because it is both nonsensical to not do so
  - it also breaks system checkers, bug reporting, etc
 
 Bug: http://www.cups.org/str.php?L2935
 Bug-Debian: http://bugs.debian.org/410171
-Last-Update: 2015-02-10
-
-Patch-Name: rootbackends-worldreadable.patch
 ---
  backend/Makefile         | 4 ++--
  scheduler/cups-deviced.c | 2 +-
diff --git a/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
index b20850923..4875f106f 100644
--- a/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch
+++ b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -1,18 +1,18 @@
-From 862fa923cfea789a75c633f26d6287cd51e8f1d9 Mon Sep 17 00:00:00 2001
+From 6092b2062b963ce516efe196384415222f4fe1c7 Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:30 +0200
-Subject: Let the "snmp" backend also use the manufacturer-specific
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
- MIBs of HP and Ricoh to obtain the device IDs of network-connected
+ … of HP and Ricoh to obtain the device IDs of network-connected
  printers. This way we get more reliable information about make and model
- and in addition the supported page description languages, which allow to
+ and in addition the supported page description languages, which allows one to
  identify whether an optional PostScript add-on is installed or for an
  unsupported printer which generic PPD is the best choice (requested by
  Ricoh).
 Bug: https://www.cups.org/str.php?L3552
-Last-Update: 2015-02-10
-
-Patch-Name: cups-snmp-oids-device-id-hp-ricoh.patch
 ---
  backend/snmp.c | 8 ++++++++
  1 file changed, 8 insertions(+)
diff --git a/debian/patches/0037-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0037-Build-mantohtml-with-the-build-architecture-compiler.patch
index 5718b07f6..71045c925 100644
--- a/debian/patches/0037-Build-mantohtml-with-the-build-architecture-compiler.patch
+++ b/debian/patches/0037-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -1,4 +1,4 @@
-From 4599da52a5c56b8acc2d9d00e6c1a78f2faf8b83 Mon Sep 17 00:00:00 2001
+From 3fbb29bc87ee87c346c8b4f886748d7dae6e960c 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/0038-The-lp-and-lpr-commands-now-provide-better-error-mes.patch b/debian/patches/0038-The-lp-and-lpr-commands-now-provide-better-error-mes.patch
index cb6e6f218..cb2f19e9c 100644
--- a/debian/patches/0038-The-lp-and-lpr-commands-now-provide-better-error-mes.patch
+++ b/debian/patches/0038-The-lp-and-lpr-commands-now-provide-better-error-mes.patch
@@ -1,4 +1,4 @@
-From 32fcba0da30de326235ff23d1e4e1002f1d4efed Mon Sep 17 00:00:00 2001
+From 8725244c07382b15e8e1ac38db8d206ac38b16dc Mon Sep 17 00:00:00 2001
 From: Michael R Sweet <michaelrsweet@gmail.com>
 Date: Wed, 1 Nov 2017 15:45:50 -0400
 Subject: =?UTF-8?q?The=20`lp`=20and=20`lpr`=20commands=20now=20provide=20b?=
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
index 763a73539..bff445647 100644
--- a/debian/patches/airprint-support.patch
+++ b/debian/patches/airprint-support.patch
@@ -1,4 +1,4 @@
-From 72d2b50420cf26e981bc417cbdb0923eaca16e32 Mon Sep 17 00:00:00 2001
+From 438e9f6f3d09348804580191c047f251453f9a0e 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 6c73aaf30..40ddb612b 100644
--- a/debian/patches/confdirperms.patch
+++ b/debian/patches/confdirperms.patch
@@ -1,4 +1,4 @@
-From 1c9f5acdf2938195494ddcf6c68b52f0b7277065 Mon Sep 17 00:00:00 2001
+From eb8f1cad8b8518c68e22225dfc2149b54aa34e27 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-deviced-allow-device-ids-with-newline.patch b/debian/patches/cups-deviced-allow-device-ids-with-newline.patch
index 912749cb4..8234daa2a 100644
--- a/debian/patches/cups-deviced-allow-device-ids-with-newline.patch
+++ b/debian/patches/cups-deviced-allow-device-ids-with-newline.patch
@@ -1,4 +1,4 @@
-From 474eca17c1d542f9e4c0c7171db62fe15eb5c945 Mon Sep 17 00:00:00 2001
+From 72869e78637595bd7b2e527f95fe25a1761a8139 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:28 +0200
 Subject: Some printers have broken device IDs with newline
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 bf41a7a13..4723ce681 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 708f25849db4e74b25895713b2d215450f9c2fbb Mon Sep 17 00:00:00 2001
+From 84a5bc439998c04fc26c89752dddeac2456596f2 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 2c1cd101f..fe2c5252d 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 22290df31828d26854c53c6ed63dda7458658bbc Mon Sep 17 00:00:00 2001
+From e1dba7078c567b200b1437d6ca517a42a396b376 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 5a7ad58a3..aa365b902 100644
--- a/debian/patches/debianize_cups-config.patch
+++ b/debian/patches/debianize_cups-config.patch
@@ -1,4 +1,4 @@
-From 147fa4c803421a03c71669235bd830a47c12d949 Mon Sep 17 00:00:00 2001
+From 6c7c6ac9639319ff8a324fd979e830b44cac462a 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 d57c11752..b727684e3 100644
--- a/debian/patches/default_log_settings.patch
+++ b/debian/patches/default_log_settings.patch
@@ -1,4 +1,4 @@
-From 1c92e0f3ed26ad9661c0933197b005766d94c0b3 Mon Sep 17 00:00:00 2001
+From 09f2dff4f55572b6bc43cdfe10583b75d174a18b 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 233b03649..8e41006b9 100644
--- a/debian/patches/do-not-broadcast-with-hostnames.patch
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -1,4 +1,4 @@
-From 681dcb10a55a5fdf6d70197a1010944e8f2d98e1 Mon Sep 17 00:00:00 2001
+From d4836a7508360f002242152818275057e85eb250 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/drop_unnecessary_dependencies.patch b/debian/patches/drop_unnecessary_dependencies.patch
index 1903b47ea..bd18f89c3 100644
--- a/debian/patches/drop_unnecessary_dependencies.patch
+++ b/debian/patches/drop_unnecessary_dependencies.patch
@@ -1,4 +1,4 @@
-From 228064837abc2a9a6eba2900e69de87af39a1c1b Mon Sep 17 00:00:00 2001
+From f5a40c519699d77a7265fbe7993df890ab4c00c0 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:25 +0200
 Subject: Do not link libcups.so and libcupsimage.so unnecessarily
diff --git a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
index 56f7acba2..9e6a8d07d 100644
--- a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+++ b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
@@ -1,4 +1,4 @@
-From b29f8624fadd974620b8fddf5f4d3285fedce545 Mon Sep 17 00:00:00 2001
+From 958625d59f2ff723fbf4a535cee7e6ea251b8732 Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:07 +0200
 Subject: Fix jobs with multiple files or multiple formats
diff --git a/debian/patches/log-debug-history-nearly-unlimited.patch b/debian/patches/log-debug-history-nearly-unlimited.patch
index a5b040383..a8c18d894 100644
--- a/debian/patches/log-debug-history-nearly-unlimited.patch
+++ b/debian/patches/log-debug-history-nearly-unlimited.patch
@@ -1,4 +1,4 @@
-From ba2e141846763083d1af7d273eb03652ca727ece Mon Sep 17 00:00:00 2001
+From 40f66b7af75a7cbcef0cdee460f99fa10ad1ad9c 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 59b05ddca..195e0df7e 100644
--- a/debian/patches/logfiles_adm_readable.patch
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -1,4 +1,4 @@
-From bafb53ed8a29af7268fd2f5c0fe95cd7d4fb6cd7 Mon Sep 17 00:00:00 2001
+From 845da2f2469b615469793936210feb166920645a 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 a1f98d4fb..3b2888c08 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 e393234a16125562cf5a58ef635ff3a4d24639f1 Mon Sep 17 00:00:00 2001
+From ae59e961fe313aabd7f2937ef397e1a9eee28a07 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 5c6ae7c49..d148d5386 100644
--- a/debian/patches/manpage-translations.patch
+++ b/debian/patches/manpage-translations.patch
@@ -1,4 +1,4 @@
-From f09aa3c2689c3bba08d5e0a09d9edfa2b74afc31 Mon Sep 17 00:00:00 2001
+From ee70ef524725b8b2b2a2a4a2667dae17af343282 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 995d01b0f..c181061f2 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 ac0048f0e0c70efecd4e859a98f719af71e23f6c Mon Sep 17 00:00:00 2001
+From 636736bf6b694603432da1f72f07754d29e1673d 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 0785e1184..8e2526c68 100644
--- a/debian/patches/no-conffile-timestamp.patch
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -1,4 +1,4 @@
-From 07d80b22d5cd32bdcbf8fbde072d67639937e74a Mon Sep 17 00:00:00 2001
+From 4491ccae6dc4e396f8aca0e8ef44dbaf0a54a675 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/printer-filtering.patch b/debian/patches/printer-filtering.patch
index f1ceff18a..bcad431a2 100644
--- a/debian/patches/printer-filtering.patch
+++ b/debian/patches/printer-filtering.patch
@@ -1,4 +1,4 @@
-From 837acbeeb0238d8b57338d0a3ae7a1c8539306a7 Mon Sep 17 00:00:00 2001
+From 1623ffa3b27f82f31ac9d4718957b9cc512cae3e Mon Sep 17 00:00:00 2001
 From: Julien Desfossez at Revolution Linux
  <Julien Desfossez at Revolution Linux>
 Date: Tue, 9 Aug 2016 18:11:42 +0200
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
index 91bb426fb..2a436839d 100644
--- a/debian/patches/reactivate_recommended_driver.patch
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -1,4 +1,4 @@
-From 9f9ba35b3c51ceeb3dbc1842549aaf6923509fa3 Mon Sep 17 00:00:00 2001
+From 435af6d9a0746b2a573eb34cf400bebd5aeda493 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/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch b/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
index c9692254c..4a22e2992 100644
--- a/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
+++ b/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
@@ -1,4 +1,4 @@
-From 648604388ab13dc7a2645e435f2c84ca7a73610f Mon Sep 17 00:00:00 2001
+From a4e3b922cafa03ad5140d0184cda424d74fcc4b6 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:27 +0200
 Subject: Make CUPS reading all option settings in PostScript print
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
index b453dfb94..b874f6192 100644
--- a/debian/patches/removecvstag.patch
+++ b/debian/patches/removecvstag.patch
@@ -1,4 +1,4 @@
-From 0fa2a60bbb05353a1d6eb00ea3860d36574af656 Mon Sep 17 00:00:00 2001
+From f4f3adaf2b30c57e60965020346f9da204084444 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 78f45c41e..866c8fe42 100644
--- a/debian/patches/rename-systemd-units.patch
+++ b/debian/patches/rename-systemd-units.patch
@@ -1,4 +1,4 @@
-From 32d4d8f78cc736877e1070ac58b3516a03cd0bfc Mon Sep 17 00:00:00 2001
+From 6e5745efd0d422cf8fd3b6d4371d620cfdaaeb25 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 8f91b4288..3c50824a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 pwg-raster-attributes.patch
 manpage-hyphen-minus.patch
-rootbackends-worldreadable.patch
+0003-Install-root-backends-world-readable.patch
 fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
 tests-ignore-warnings.patch
 tests-ignore-usb-crash.patch
@@ -18,7 +18,7 @@ drop_unnecessary_dependencies.patch
 read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
 cups-deviced-allow-device-ids-with-newline.patch
 airprint-support.patch
-cups-snmp-oids-device-id-hp-ricoh.patch
+0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 no-conffile-timestamp.patch
 removecvstag.patch
 rename-systemd-units.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
index 0637f2c51..1b20b91f6 100644
--- a/debian/patches/show-compile-command-lines.patch
+++ b/debian/patches/show-compile-command-lines.patch
@@ -1,4 +1,4 @@
-From b2427510026566b279a64db7199de98357f51607 Mon Sep 17 00:00:00 2001
+From 0f4afef6c36332b606db8217b6a3bf8d33629538 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 0edfeb72d..69534b597 100644
--- a/debian/patches/test-i18n-nonlinux.patch
+++ b/debian/patches/test-i18n-nonlinux.patch
@@ -1,4 +1,4 @@
-From 1c98a8374e98a30df827164470333a5c78050b00 Mon Sep 17 00:00:00 2001
+From e80cf44f0e8306861e4a6cd501d9176ba6321ba8 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 abc8161a6..94a79c659 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 7a9f6e2fc5c5666a2691d23caf31c6dec5c6d66f Mon Sep 17 00:00:00 2001
+From ad183a459c66cc1bec8727a685235d9ae277ea46 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-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
index 84ca269be..5acd26cb7 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 f03d858f9737597d2e47036ee583a979a65101df Mon Sep 17 00:00:00 2001
+From 216ab53fd4e0efbd4c9bff23e0db41aa0e89ff2f 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
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 9c711e856..b1d6359b0 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 142730190adb59fbad4128de8a7033ca5278e00a Mon Sep 17 00:00:00 2001
+From 0c0de72ae34c09b6ec938d4a78be9bf190d16e7d 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
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 f1bb08078..23c7c2a2a 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 33de13b13e5582c752563ff287ba188bb25ac23f Mon Sep 17 00:00:00 2001
+From 31de6465febf604c20afde267596e98e733ba990 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
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
index ab562e537..8faf1757f 100644
--- a/debian/patches/tests-ignore-usb-crash.patch
+++ b/debian/patches/tests-ignore-usb-crash.patch
@@ -1,4 +1,4 @@
-From 052cdefe4551d8ba277e6602680e3d5416a331b9 Mon Sep 17 00:00:00 2001
+From a377691ca08b10ec3976300d5ad02b05f19307cf 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
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
index fe42abe30..fcfb94276 100644
--- a/debian/patches/tests-ignore-warnings.patch
+++ b/debian/patches/tests-ignore-warnings.patch
@@ -1,4 +1,4 @@
-From d37dc8831ea449603e4a8b66ea889821e8849a36 Mon Sep 17 00:00:00 2001
+From 44d082e3a3d2f673801d8e78d66ce08a2cb2236d 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
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
index 26e575bfa..4da028da5 100644
--- a/debian/patches/tests-make-lpstat-call-reproducible.patch
+++ b/debian/patches/tests-make-lpstat-call-reproducible.patch
@@ -1,4 +1,4 @@
-From 4837365f0feb6388031b747fe929a3f417ae72e2 Mon Sep 17 00:00:00 2001
+From d0b8a43d94dc57cb5363e48c3bcb18449d3b9505 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
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
index a8ed92360..8d6bc089b 100644
--- a/debian/patches/tests-no-pdftourf.patch
+++ b/debian/patches/tests-no-pdftourf.patch
@@ -1,4 +1,4 @@
-From 6432639a76e58969008a8cf5847e5186a4ef7090 Mon Sep 17 00:00:00 2001
+From 6a354c3169ea6469bb71e51fc6d7d23e62f7fcaa 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 pdftourf filter addition in tests
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
index 50d66be57..4642a7213 100644
--- a/debian/patches/tests-use-ipv4-lo-address.patch
+++ b/debian/patches/tests-use-ipv4-lo-address.patch
@@ -1,4 +1,4 @@
-From 261b425884def3cd11ad8dfb25424471d88e0ac1 Mon Sep 17 00:00:00 2001
+From 1697ce7557145b73c55f1c82aec6b70f45228432 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
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
index cdedc5289..deee87c69 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 55b33ce84531feda885886237245f4774c6cfbc8 Mon Sep 17 00:00:00 2001
+From faa9cfa7c22a95abb45d5ed38d894b518e934a2c 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