merge patched-debian/experimental into debian/experimental

25 files changed, 28 insertions, 28 deletions

diff --git a/cups/Makefile b/cups/Makefile
index 35fa45f42..9322b9d93 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -356,7 +356,7 @@ uninstall:
 libcups.so.2:	$(LIBOBJS)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) -lpthread $(LIBZ)
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) -lpthread $(LIBZ) -lm
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`
 
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 9f457f0b0..bb5b73007 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-bb99601bd973a0189e7129311379bc8c9da6fd8c
-bb99601bd973a0189e7129311379bc8c9da6fd8c
+29ac66dad00b4df4d6fb1359780adfdb71411255
+29ac66dad00b4df4d6fb1359780adfdb71411255
 c13e2f44eb15bcdbff9126df86d1ed9a5108e47c
 c13e2f44eb15bcdbff9126df86d1ed9a5108e47c
 cups_2.3~b6.orig.tar.gz
diff --git a/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
index 770164c22..7bf40ae12 100644
--- a/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+++ b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -1,4 +1,4 @@
-From 256aade4a39903c1c64f1c732e0cc275ab14507d Mon Sep 17 00:00:00 2001
+From 6168f0f69586f74a762a013ce17621a4fe665cf3 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/0037-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0037-Build-mantohtml-with-the-build-architecture-compiler.patch
index d3b5312fd..6ed961e7e 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 91000b019a3c640bf626d6f7ce262351260a191e Mon Sep 17 00:00:00 2001
+From 7477e87c930e61476098303bd3f43ff89136a938 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/0039-Fix-usage-int-usage-for-cupsd-help.patch b/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch
index e593f5da0..f008233ea 100644
--- a/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch
+++ b/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch
@@ -1,4 +1,4 @@
-From bb99601bd973a0189e7129311379bc8c9da6fd8c Mon Sep 17 00:00:00 2001
+From 29ac66dad00b4df4d6fb1359780adfdb71411255 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Mon, 10 Dec 2018 09:32:14 +0100
 Subject: Fix usage(int) usage for cupsd --help
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
index 23d849641..a40b6af41 100644
--- a/debian/patches/airprint-support.patch
+++ b/debian/patches/airprint-support.patch
@@ -1,4 +1,4 @@
-From ee6167bf20879cb60b0b4b4963ae6ca96c82899a Mon Sep 17 00:00:00 2001
+From 93f4827feb954f08ae341d4c63689b3e5ba59b3d 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 387c20cb2..8b1d36d73 100644
--- a/debian/patches/confdirperms.patch
+++ b/debian/patches/confdirperms.patch
@@ -1,4 +1,4 @@
-From 6aed9f61d1c145d81c1dc53dc32ea037ed405f46 Mon Sep 17 00:00:00 2001
+From 7a04295d8c2529453b9f8a63fa6d84c6d5b138d0 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 c281780f7..f718a9a9a 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 f729663bda9cd75495ecfcdbaac1330deede75ce Mon Sep 17 00:00:00 2001
+From b6bbdd4e1812c11c1438ec4cc89f3bddc2aeb05a 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 0e1c641a5..60341d406 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 831d56e968d07cf137605419bbae94a0b3ecece0 Mon Sep 17 00:00:00 2001
+From 2a2e04492117a70174668a5f4b19908b6a4c7101 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 50b495719..1156f0938 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 5a9503a37822283c3c63c9b137870cc9b9ec3148 Mon Sep 17 00:00:00 2001
+From fcd3c4de9f1c2ffb91cc0dca381e83164144d6dd 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 cbb0e075e..b05473f47 100644
--- a/debian/patches/debianize_cups-config.patch
+++ b/debian/patches/debianize_cups-config.patch
@@ -1,4 +1,4 @@
-From 7b34a5ca9b8e8ff2dba5cf15cdcd4edbf83c19c3 Mon Sep 17 00:00:00 2001
+From 8ebedeeae3a5a4eade860a7918e2dfbbb8aa6f02 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 87676c178..ae2b65a31 100644
--- a/debian/patches/default_log_settings.patch
+++ b/debian/patches/default_log_settings.patch
@@ -1,4 +1,4 @@
-From 19353518bb0376cb0a340647158f6d2becbd1bbf Mon Sep 17 00:00:00 2001
+From c38dafd69fa6175de4f55c208128f9bf87686443 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 ac301b9fb..6621871b5 100644
--- a/debian/patches/do-not-broadcast-with-hostnames.patch
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -1,4 +1,4 @@
-From 12193bd7255f09bd10e072c3d80b156f71c7ae25 Mon Sep 17 00:00:00 2001
+From f87f6b5d80d5933d25bc179a5eab5c1e2c1a28ba 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 406d6a803..b775a53d3 100644
--- a/debian/patches/drop_unnecessary_dependencies.patch
+++ b/debian/patches/drop_unnecessary_dependencies.patch
@@ -1,4 +1,4 @@
-From 400b2c48ac699b1e742f66e421c0a166d4951ba9 Mon Sep 17 00:00:00 2001
+From 7dfc8d94434d759443d724bce76e8b47fb8986e8 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:25 +0200
 Subject: Don't link libcups.so and libcupsimage.so against unnecessary
@@ -29,7 +29,7 @@ index f96a5e9bf..d3e96e8e3 100644
  IPPFIND_BIN	=	@IPPFIND_BIN@
  IPPFIND_MAN	=	@IPPFIND_MAN@
 diff --git a/cups/Makefile b/cups/Makefile
-index b56e5f34a..35fa45f42 100644
+index b56e5f34a..9322b9d93 100644
 --- a/cups/Makefile
 +++ b/cups/Makefile
 @@ -356,7 +356,7 @@ uninstall:
@@ -37,7 +37,7 @@ index b56e5f34a..35fa45f42 100644
  	echo Linking $@...
  	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) \
 -		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
-+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) -lpthread $(LIBZ)
++		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) -lpthread $(LIBZ) -lm
  	$(RM) `basename $@ .2`
  	$(LN) $@ `basename $@ .2`
  
diff --git a/debian/patches/log-debug-history-nearly-unlimited.patch b/debian/patches/log-debug-history-nearly-unlimited.patch
index 977c7c09c..bdca6ba8f 100644
--- a/debian/patches/log-debug-history-nearly-unlimited.patch
+++ b/debian/patches/log-debug-history-nearly-unlimited.patch
@@ -1,4 +1,4 @@
-From bbc85129ac9a0fa232bd1a4f3e820981cb77f05b Mon Sep 17 00:00:00 2001
+From 018e64b9781c9c1f6cd454197f8280d947ee5680 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 75da42f05..a35eaafcc 100644
--- a/debian/patches/logfiles_adm_readable.patch
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -1,4 +1,4 @@
-From 6b02385777bac4afc282a59098e53bef542802e4 Mon Sep 17 00:00:00 2001
+From ba8db70c9122b50e57d9177239ea152ad5f59c3a 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 26864a01d..e1124473e 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 7416e3aeab64195ccf8c5cc02a7f9823d13ef4d5 Mon Sep 17 00:00:00 2001
+From 6f02ec18a0ebd8fe9a62f4680bc9cdd434cbf7d3 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 cef38450c..362140cf4 100644
--- a/debian/patches/manpage-translations.patch
+++ b/debian/patches/manpage-translations.patch
@@ -1,4 +1,4 @@
-From dadbae12448a8c85bb8181f88349f6e7bfd6862f Mon Sep 17 00:00:00 2001
+From 7775a2fc70523bb7ae4e5c39dee513dc23640fa3 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/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
index 6163726cd..20e2514e5 100644
--- a/debian/patches/no-conffile-timestamp.patch
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -1,4 +1,4 @@
-From f9e20100e34bbc5feb7c435068f1752c8aa7a944 Mon Sep 17 00:00:00 2001
+From 8b7ff12e7fc2be79621d781fd60596182d872fb4 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 4e862aad4..d7c148b43 100644
--- a/debian/patches/printer-filtering.patch
+++ b/debian/patches/printer-filtering.patch
@@ -1,4 +1,4 @@
-From 5ca3b1d8b9e30a8384f63c3bcd8b48f608ecf05f Mon Sep 17 00:00:00 2001
+From c989728130c4472a13c8a1e70cc8ed2a759a9f0c 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 0eb26ea82..803e006fb 100644
--- a/debian/patches/reactivate_recommended_driver.patch
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -1,4 +1,4 @@
-From a4815d0dfb9b56b4c6c808ce25ad571f47b81946 Mon Sep 17 00:00:00 2001
+From 3f98ba2830600a81186604ac26262315339f4f6f 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 cab65e624..23d0c1fd4 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 df27a24bc4205fed990cab2c79321cddc5059b93 Mon Sep 17 00:00:00 2001
+From 68c1a032cb4aded4830827761a3eea29b5b32eb9 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 685529c77..e57711903 100644
--- a/debian/patches/removecvstag.patch
+++ b/debian/patches/removecvstag.patch
@@ -1,4 +1,4 @@
-From 1d103ea2bb71b207ac54a244cf5f4b8308e38f0a Mon Sep 17 00:00:00 2001
+From ae5c167695f4d4356788685a1503bc646e5387d3 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 cfaff959c..4340ec194 100644
--- a/debian/patches/rename-systemd-units.patch
+++ b/debian/patches/rename-systemd-units.patch
@@ -1,4 +1,4 @@
-From e2e1b1d746da4e9e795a16ac17ced8d550734737 Mon Sep 17 00:00:00 2001
+From 2802c396f7a676e57fc04f44071500f29f0778fb 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/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
index 5a921d16d..6db215265 100644
--- a/debian/patches/show-compile-command-lines.patch
+++ b/debian/patches/show-compile-command-lines.patch
@@ -1,4 +1,4 @@
-From c131f5508851ba118a1f3f27a4ed08779c78c9b0 Mon Sep 17 00:00:00 2001
+From e3ae5e69f4af97fc37175ef6dd7e34a68eefb5bf 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