diff options
| author | Didier Raboud <odyx@debian.org> | 2019-05-06 15:31:06 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2019-05-06 15:31:07 +0200 |
| commit | 49ba8b03b2170839606d85f1849ff5fb83dd814b (patch) | |
| tree | 6940b3d4056ecdb0eba21e2d9a3218fffbe17d0c /debian | |
| parent | dc9e5528de9bfd5d2684f37416c656adf18907e4 (diff) | |
| parent | 01a633a48c666c5b9e9d799abd71dabbb680458e (diff) | |
merge patched-debian/experimental into debian/experimental
Diffstat (limited to 'debian')
35 files changed, 300 insertions, 275 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 0a38c2a5b..a2ff9c951 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,7 +1,7 @@ # see git-dpm(1) from git-dpm package -91981a9214c524b9054d30bd755d930ad2ad8a6d -91981a9214c524b9054d30bd755d930ad2ad8a6d -b1e7afd5964cbe1aeab6f0a2d5b33884693a143a +01a633a48c666c5b9e9d799abd71dabbb680458e +01a633a48c666c5b9e9d799abd71dabbb680458e +0450ddd4f003de8aa8d8e7a54d181a992607d031 0450ddd4f003de8aa8d8e7a54d181a992607d031 cups_2.3~b8.orig.tar.gz 37ef96f807832dcfdd36d8fcb80771fce663547e diff --git a/debian/patches/0003-Install-root-backends-world-readable.patch b/debian/patches/0003-Install-root-backends-world-readable.patch index cf5c2f676..e48a8be22 100644 --- a/debian/patches/0003-Install-root-backends-world-readable.patch +++ b/debian/patches/0003-Install-root-backends-world-readable.patch @@ -1,4 +1,4 @@ -From 1cf5a4e5689ca9d224332b8d267454b6cd8a31a4 Mon Sep 17 00:00:00 2001 +From 4d79affc4527969a2e3c06d4c307c2ab9d5802d0 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 @@ -17,7 +17,7 @@ Bug-Debian: http://bugs.debian.org/410171 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/Makefile b/backend/Makefile -index 4a1a56eed..de0d77e84 100644 +index 85fda17a9..3addf5d61 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -13,7 +13,7 @@ include ../Makedefs @@ -52,7 +52,7 @@ index 77703b983..14478fd99 100644 cupsDirClose(dir); diff --git a/scheduler/job.c b/scheduler/job.c -index da7cb9c08..de22a5f55 100644 +index 33ad7025b..81acecdfa 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ diff --git a/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch index fe5130914..c7879697d 100644 --- a/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch +++ b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch @@ -1,4 +1,4 @@ -From 8da26a347a779bc58ad2baa4ab7285741dc872b0 Mon Sep 17 00:00:00 2001 +From dc4aa9516f62cc7d2d412072fc2415e0eb067e99 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/0033-Build-mantohtml-with-the-build-architecture-compiler.patch index b396c05ce..fae5c9cc0 100644 --- a/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch +++ b/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch @@ -1,4 +1,4 @@ -From 8170a208349485cff63d4406e7b0699c2b14c5ce Mon Sep 17 00:00:00 2001 +From 51096b6b67eee649bfea795f2fc9d552bb4734ef 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 @@ -18,7 +18,7 @@ Bug-Debian: https://bugs.debian.org/837936 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Makedefs.in b/Makedefs.in -index 367f73c81..9c5d8f39e 100644 +index 92850dbcc..b8784ce5e 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -22,6 +22,7 @@ CUPS_VERSION = @CUPS_VERSION@ @@ -30,7 +30,7 @@ index 367f73c81..9c5d8f39e 100644 CXX = @LIBTOOL_CXX@ @CXX@ DSO = @DSO@ diff --git a/configure.ac b/configure.ac -index 9f5b41d5d..3307c13f9 100644 +index 190e78da0..974f98dac 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4) @@ -50,15 +50,15 @@ index 9f5b41d5d..3307c13f9 100644 sinclude(config-scripts/cups-libtool.m4) sinclude(config-scripts/cups-compiler.m4) diff --git a/man/Makefile b/man/Makefile -index 1335d7d2b..5d5d0ee4f 100644 +index efd9ca3bb..e01591a93 100644 --- a/man/Makefile +++ b/man/Makefile -@@ -220,8 +220,5 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml - ./mantohtml `basename $$file .$(MAN8EXT)`.man >../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \ +@@ -222,8 +222,5 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml + ./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \ done -mantohtml: mantohtml.o ../cups/$(LIBCUPSSTATIC) -- $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \ +- $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o \ - ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ - $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch index 23806bd5e..97777ec33 100644 --- a/debian/patches/airprint-support.patch +++ b/debian/patches/airprint-support.patch @@ -1,4 +1,4 @@ -From ca92574b58092fb0e824ce9e6e44c582daacae57 Mon Sep 17 00:00:00 2001 +From f83e146d4844d023c2c4d26dd499292678cca3eb 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 @@ -48,7 +48,7 @@ index fcd6b6eff..ebb05257e 100644 # # Text files... diff --git a/scheduler/conf.c b/scheduler/conf.c -index 1a2b1e1ce..25eeb218c 100644 +index bb6049b2c..bb4f9d215 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -745,7 +745,7 @@ cupsdReadConfiguration(void) @@ -78,10 +78,10 @@ index ddd3701e0..fb2a30526 100644 { keyvalue[count ][0] = "air"; diff --git a/scheduler/printers.c b/scheduler/printers.c -index 7b7e68367..554703dc9 100644 +index 1984a659c..2578aa76b 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c -@@ -3812,7 +3812,9 @@ add_printer_formats(cupsd_printer_t *p) /* I - Printer */ +@@ -3811,7 +3811,9 @@ add_printer_formats(cupsd_printer_t *p) /* I - Printer */ } else if (!_cups_strcasecmp(type->super, "image")) { diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch index 6e5cc84aa..d9934e451 100644 --- a/debian/patches/confdirperms.patch +++ b/debian/patches/confdirperms.patch @@ -1,4 +1,4 @@ -From e81b709d97fe38fc2c4815df04acff8355c8a5d3 Mon Sep 17 00:00:00 2001 +From add1f9d557836e0c235abf017d8ac33bb7b31620 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. @@ -11,7 +11,7 @@ Patch-Name: confdirperms.patch 1 file changed, 2 insertions(+) diff --git a/scheduler/conf.c b/scheduler/conf.c -index 6bcbb262b..a1d9e44eb 100644 +index b73d33f93..31eedbf71 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void) 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 fba651d63..272206d23 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 fd31b7701639ede0d6424eff18a76f3c815d249c Mon Sep 17 00:00:00 2001 +From 9d057eaabc86e56a6895c4a3dc900245928d2768 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 @@ -13,12 +13,12 @@ Last-Update: 2016-07-03 Patch-Name: cups-set-default-error-policy-retry-job.patch --- doc/help/man-cupsd.conf.html | 4 ++-- - man/cupsd.conf.man.in | 4 ++-- + man/cupsd.conf.5 | 4 ++-- scheduler/conf.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html -index b1b0ac0b5..8b68adc5f 100644 +index f889b866f..862d92e20 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname. @@ -33,10 +33,10 @@ index b1b0ac0b5..8b68adc5f 100644 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i> <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems. A limit of 0 disables filter limiting. -diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in -index ac00fa191..4bae8133d 100644 ---- a/man/cupsd.conf.man.in -+++ b/man/cupsd.conf.man.in +diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 +index 5788265fa..79f17ea0c 100644 +--- a/man/cupsd.conf.5 ++++ b/man/cupsd.conf.5 @@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. .TP 5 @@ -51,7 +51,7 @@ index ac00fa191..4bae8133d 100644 .TP 5 \fBFilterLimit \fIlimit\fR diff --git a/scheduler/conf.c b/scheduler/conf.c -index 59238e0ae..c9182a058 100644 +index d90f41d7b..f4f6a410f 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -752,7 +752,7 @@ cupsdReadConfiguration(void) 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 07775bbe5..eb40027bc 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 4b2c249f95612fe54deceb76e1fbe1d0813b20dd Mon Sep 17 00:00:00 2001 +From 700d1fcf02465abcca21092960f07d01d9e9094d 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 @@ -9,7 +9,7 @@ Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch --- conf/cups-files.conf.in | 2 +- doc/help/man-cups-files.conf.html | 2 +- - man/cups-files.conf.man.in | 2 +- + man/cups-files.conf.5 | 2 +- scheduler/conf.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) @@ -27,7 +27,7 @@ index 4a78ba615..a3d088da5 100644 # Default user and group for filters/backends/helper programs; this cannot be # any user or group that resolves to ID 0 for security reasons... diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html -index bc2900777..5ad464ba1 100644 +index 27a1b60da..d7995cbbe 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform. @@ -39,10 +39,10 @@ index bc2900777..5ad464ba1 100644 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ] <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication. The default contains "admin", "lpadmin", "root", "sys", and/or "system". -diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in -index fe2d7aa52..bd61c96cc 100644 ---- a/man/cups-files.conf.man.in -+++ b/man/cups-files.conf.man.in +diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5 +index 72494065c..955f47b55 100644 +--- a/man/cups-files.conf.5 ++++ b/man/cups-files.conf.5 @@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform. Specifies whether the scheduler calls .BR fsync (2) @@ -53,7 +53,7 @@ index fe2d7aa52..bd61c96cc 100644 .TP 5 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ] diff --git a/scheduler/conf.c b/scheduler/conf.c -index c66e35322..59238e0ae 100644 +index 850d8cb59..d90f41d7b 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -735,7 +735,7 @@ cupsdReadConfiguration(void) @@ -62,6 +62,6 @@ index c66e35322..59238e0ae 100644 StrictConformance = FALSE; - SyncOnClose = FALSE; + SyncOnClose = TRUE; - Timeout = DEFAULT_TIMEOUT; + Timeout = 900; WebInterface = CUPS_DEFAULT_WEBIF; diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch index 3136560f6..d12058c15 100644 --- a/debian/patches/debianize_cups-config.patch +++ b/debian/patches/debianize_cups-config.patch @@ -1,4 +1,4 @@ -From a29e45d362f54d695f420d8a673d75d5d3ab2338 Mon Sep 17 00:00:00 2001 +From 5a4fa1e305c22cdda5ab8de2f02d4f87cae4f4b5 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 @@ -14,25 +14,23 @@ Bug-Debian: https://bugs.debian.org/751157 Last-Update: 2014-06-11 Patch-Name: debianize_cups-config.patch --- - cups-config.in | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) + cups-config.in | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cups-config.in b/cups-config.in -index a73a70fcb..048554ad5 100755 +index 64c893c0d..ce3b6f187 100755 --- a/cups-config.in +++ b/cups-config.in -@@ -17,8 +17,8 @@ prefix=@prefix@ +@@ -17,7 +17,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ includedir=@includedir@ -libdir=@libdir@ --imagelibdir=@libdir@ +libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) -+imagelibdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) datarootdir=@datadir@ datadir=@datadir@ sysconfdir=@sysconfdir@ -@@ -30,7 +30,8 @@ INSTALLSTATIC=@INSTALLSTATIC@ +@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@ # flags for C++ compiler: CFLAGS="" LDFLAGS="@EXPORT_LDFLAGS@" @@ -42,7 +40,7 @@ index a73a70fcb..048554ad5 100755 # Check for local invocation... selfdir=`dirname $0` -@@ -45,7 +46,7 @@ else +@@ -43,7 +44,7 @@ else CFLAGS="$CFLAGS -I$includedir" fi @@ -51,12 +49,12 @@ index a73a70fcb..048554ad5 100755 LDFLAGS="$LDFLAGS -L$libdir" fi fi -@@ -100,7 +101,7 @@ while test $# -gt 0; do +@@ -98,7 +99,7 @@ while test $# -gt 0; do ;; --libs) if test $static = no; then - libs="@EXTLINKCUPS@ $LIBS"; + libs="@EXTLINKCUPS@"; - if test $image = yes; then - libs="@EXTLINKCUPSIMAGE@ $libs" - fi + else + libs="$libdir/libcups.a $LIBS"; + fi diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch index 07c8c52a5..d684f40a6 100644 --- a/debian/patches/default_log_settings.patch +++ b/debian/patches/default_log_settings.patch @@ -1,4 +1,4 @@ -From f920257fe1bb37089e7bb4bf70c4644a88f22341 Mon Sep 17 00:00:00 2001 +From 73fd59f780f09aa972f5aec45d8c84831cf20b6d 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 d9a7a1761..7430c4903 100644 --- a/debian/patches/do-not-broadcast-with-hostnames.patch +++ b/debian/patches/do-not-broadcast-with-hostnames.patch @@ -1,4 +1,4 @@ -From 2aeca51f4df7331f4493965ce7159b92a7436502 Mon Sep 17 00:00:00 2001 +From f00fe3a146439c3c77f1d8ff610313f5559ed31e 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 @@ -13,7 +13,7 @@ Patch-Name: do-not-broadcast-with-hostnames.patch 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scheduler/conf.c b/scheduler/conf.c -index 25eeb218c..6bcbb262b 100644 +index bb4f9d215..b73d33f93 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -899,7 +899,7 @@ cupsdReadConfiguration(void) 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 82bdd3a39..b83d94735 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 083c506f52ca9a6adace8f090b82d0cdc4e7c6ea Mon Sep 17 00:00:00 2001 +From ccd55fb0cb143883744b5afb3eb3214d3daf7823 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 @@ -12,10 +12,10 @@ Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/ipp.c b/backend/ipp.c -index d23569830..56c0ef309 100644 +index 7851956db..08a61960b 100644 --- a/backend/ipp.c +++ b/backend/ipp.c -@@ -1807,7 +1807,10 @@ main(int argc, /* I - Number of command-line args */ +@@ -1803,7 +1803,10 @@ main(int argc, /* I - Number of command-line args */ ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", (i + 1) >= num_files); diff --git a/debian/patches/log-debug-history-nearly-unlimited.patch b/debian/patches/log-debug-history-nearly-unlimited.patch index 2a41aab74..8bf3ea984 100644 --- a/debian/patches/log-debug-history-nearly-unlimited.patch +++ b/debian/patches/log-debug-history-nearly-unlimited.patch @@ -1,4 +1,4 @@ -From 60bca31617b124af792943c4ab8b16ba68c15da9 Mon Sep 17 00:00:00 2001 +From 7868a0d172ec72a41b4a892fcac5784c85a9d24e 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 @@ -11,7 +11,7 @@ Patch-Name: log-debug-history-nearly-unlimited.patch 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scheduler/conf.c b/scheduler/conf.c -index a1d9e44eb..c66e35322 100644 +index 31eedbf71..850d8cb59 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -721,7 +721,7 @@ cupsdReadConfiguration(void) diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch index 22dfc50ab..c227df3fa 100644 --- a/debian/patches/logfiles_adm_readable.patch +++ b/debian/patches/logfiles_adm_readable.patch @@ -1,4 +1,4 @@ -From c10b7f5a54079d225ae6b75aee43a2782a6c104f Mon Sep 17 00:00:00 2001 +From 6efd709f1c5ebe5a87d6403444e24543e05dfcc7 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 88905e386..9c9ce55f4 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 25b0df63b43c152623013661fd314992300864a9 Mon Sep 17 00:00:00 2001 +From acc4494afa9dff8c4b6801c2982e1bfe755caaf3 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 @@ -7,14 +7,14 @@ Bug-Debian: http://bugs.debian.org/570157 Last-Update: 2015-10-02 Patch-Name: man-cups-lpd-drop-dangling-references.patch --- - man/cups-lpd.man.in | 2 -- + man/cups-lpd.8 | 2 -- 1 file changed, 2 deletions(-) -diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in -index 0696b8451..34d693007 100644 ---- a/man/cups-lpd.man.in -+++ b/man/cups-lpd.man.in -@@ -105,9 +105,7 @@ Simply enable the +diff --git a/man/cups-lpd.8 b/man/cups-lpd.8 +index 344d2af2b..e998df361 100644 +--- a/man/cups-lpd.8 ++++ b/man/cups-lpd.8 +@@ -109,9 +109,7 @@ Simply enable the .B cups-lpd service using the corresponding control program. .SH SEE ALSO diff --git a/debian/patches/manpage-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch index a3771ec69..abc439876 100644 --- a/debian/patches/manpage-hyphen-minus.patch +++ b/debian/patches/manpage-hyphen-minus.patch @@ -1,4 +1,4 @@ -From 97b417c21ae265edd382cdf106956f17e662b729 Mon Sep 17 00:00:00 2001 +From a7228d7f1b880cca9d170c04d87e49b852811de0 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:05 +0200 Subject: Fix hyphen-used-as-minus-sign manpage errors @@ -12,55 +12,56 @@ Last-Update: 2015-02-10 Patch-Name: manpage-hyphen-minus.patch --- - man/backend.man | 4 ++-- - man/client.conf.man.in | 4 ++-- - man/cups-files.conf.man.in | 2 +- - man/cups-lpd.man.in | 6 +++--- - man/cups-snmp.conf.man | 2 +- - man/cups.man | 2 +- - man/cupsctl.man | 6 +++--- - man/cupsd-logs.man | 36 ++++++++++++++++++------------------ - man/cupsd.conf.man.in | 2 +- - man/cupsfilter.man | 2 +- - man/filter.man | 2 +- - man/ippfind.man | 6 +++--- - man/ipptoolfile.man | 8 ++++---- - man/lp.man | 12 ++++++------ - man/lpadmin.man | 6 +++--- - man/lpoptions.man.in | 4 ++-- - man/lpr.man | 8 ++++---- - man/mime.convs.man | 6 +++--- - man/mime.types.man | 4 ++-- - man/ppdc.man | 2 +- - 20 files changed, 62 insertions(+), 62 deletions(-) + man/backend.7 | 4 ++-- + man/client.conf.5 | 4 ++-- + man/cups-files.conf.5 | 2 +- + man/cups-lpd.8 | 6 +++--- + man/cups-snmp.conf.5 | 2 +- + man/cups.1 | 2 +- + man/cupsctl.8 | 6 +++--- + man/cupsd-logs.5 | 36 ++++++++++++++++++------------------ + man/cupsd.conf.5 | 2 +- + man/cupsfilter.8 | 2 +- + man/filter.7 | 2 +- + man/ippeveprinter.1 | 6 +++--- + man/ippfind.1 | 6 +++--- + man/ipptoolfile.5 | 8 ++++---- + man/lp.1 | 12 ++++++------ + man/lpadmin.8 | 6 +++--- + man/lpoptions.1 | 4 ++-- + man/lpr.1 | 8 ++++---- + man/mime.convs.5 | 6 +++--- + man/mime.types.5 | 4 ++-- + man/ppdc.1 | 2 +- + 21 files changed, 65 insertions(+), 65 deletions(-) -diff --git a/man/backend.man b/man/backend.man -index 184e3aaa6..b309a13a9 100644 ---- a/man/backend.man -+++ b/man/backend.man -@@ -148,7 +148,7 @@ The print file was not successfully transmitted because it cannot be printed at - The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. The scheduler will respond to this by canceling the job. +diff --git a/man/backend.7 b/man/backend.7 +index 5a7032650..3c426310c 100644 +--- a/man/backend.7 ++++ b/man/backend.7 +@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job. .TP 5 .B CUPS_BACKEND_RETRY --The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job at a future time - other jobs may print before this one. -+The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job at a future time \- other jobs may print before this one. + The print file was not successfully transmitted because of a temporary issue. +-The scheduler will retry the job at a future time - other jobs may print before this one. ++The scheduler will retry the job at a future time \- other jobs may print before this one. .TP 5 .B CUPS_BACKEND_RETRY_CURRENT - The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job immediately without allowing intervening jobs. -@@ -178,7 +178,7 @@ or - .BR lpr (1) + The print file was not successfully transmitted because of a temporary issue. +@@ -198,7 +198,7 @@ or programs to send print jobs or .BR lpinfo (8) --to query for available printers using the backend. The one exception is the SNMP backend - see -+to query for available printers using the backend. The one exception is the SNMP backend \- see + to query for available printers using the backend. +-The one exception is the SNMP backend - see ++The one exception is the SNMP backend \- see .BR cups-snmp (8) for more information. - .SH SEE ALSO -diff --git a/man/client.conf.man.in b/man/client.conf.man.in -index cb93160fc..b85648954 100644 ---- a/man/client.conf.man.in -+++ b/man/client.conf.man.in -@@ -63,7 +63,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne + .SH NOTES +diff --git a/man/client.conf.5 b/man/client.conf.5 +index 8805561db..92f1d9575 100644 +--- a/man/client.conf.5 ++++ b/man/client.conf.5 +@@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients. The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The \fIDenyCBC\fR option disables all CBC cipher suites. @@ -69,7 +70,7 @@ index cb93160fc..b85648954 100644 The \fIMinTLS\fR options set the minimum TLS version to support. The \fIMaxTLS\fR options set the maximum TLS version to support. Not all operating systems support TLS 1.3 at this time. -@@ -89,7 +89,7 @@ Configuration settings can instead be viewed or changed using the +@@ -114,7 +114,7 @@ Configuration settings can instead be viewed or changed using the command: .nf defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required @@ -78,10 +79,10 @@ index cb93160fc..b85648954 100644 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption .fi -diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in -index 839cde96f..fe2d7aa52 100644 ---- a/man/cups-files.conf.man.in -+++ b/man/cups-files.conf.man.in +diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5 +index b451e2f92..72494065c 100644 +--- a/man/cups-files.conf.5 ++++ b/man/cups-files.conf.5 @@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio \fBFileDevice No\fR Specifies whether the file pseudo-device can be used for new printer queues. @@ -91,11 +92,11 @@ index 839cde96f..fe2d7aa52 100644 The specified file is overwritten for every print job. Writing to directories is not supported. .\"#FontPath -diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in -index ac7c682e6..0696b8451 100644 ---- a/man/cups-lpd.man.in -+++ b/man/cups-lpd.man.in -@@ -14,9 +14,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients +diff --git a/man/cups-lpd.8 b/man/cups-lpd.8 +index e8ce3251f..344d2af2b 100644 +--- a/man/cups-lpd.8 ++++ b/man/cups-lpd.8 +@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca [ \fB\-h \fIhostname\fR[\fB:\fIport\fR] ] [ @@ -107,7 +108,7 @@ index ac7c682e6..0696b8451 100644 .I option=value ] .SH DESCRIPTION -@@ -33,7 +33,7 @@ and +@@ -34,7 +34,7 @@ and \fB-h \fIhostname\fR[\fB:\fIport\fR] Sets the CUPS server (and port) to use. .TP 5 @@ -116,10 +117,10 @@ index ac7c682e6..0696b8451 100644 Disables reverse address lookups; normally .B cups-lpd will try to discover the hostname of the client via a reverse DNS lookup. -diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man -index 8cc273c5c..bce636c9b 100644 ---- a/man/cups-snmp.conf.man -+++ b/man/cups-snmp.conf.man +diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5 +index 4ca20f24f..bb77c7342 100644 +--- a/man/cups-snmp.conf.5 ++++ b/man/cups-snmp.conf.5 @@ -16,7 +16,7 @@ The file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. @@ -129,11 +130,11 @@ index 8cc273c5c..bce636c9b 100644 .BR cups-snmp (8). .SH DIRECTIVES The following directives are understood by the CUPS network backends: -diff --git a/man/cups.man b/man/cups.man -index 49ca183fc..6279c5273 100644 ---- a/man/cups.man -+++ b/man/cups.man -@@ -37,7 +37,7 @@ The easiest way to start is by using the web interface to configure your printer +diff --git a/man/cups.1 b/man/cups.1 +index 706620d7c..b0c51a738 100644 +--- a/man/cups.1 ++++ b/man/cups.1 +@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer .LP When you are asked for a username and password, enter your login username and password or the "root" username and password. .LP @@ -142,11 +143,11 @@ index 49ca183fc..6279c5273 100644 .LP Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly. .LP -diff --git a/man/cupsctl.man b/man/cupsctl.man -index 6fab9036d..9a70580b8 100644 ---- a/man/cupsctl.man -+++ b/man/cupsctl.man -@@ -72,19 +72,19 @@ Display the current settings: +diff --git a/man/cupsctl.8 b/man/cupsctl.8 +index 791954c19..c88eb22ec 100644 +--- a/man/cupsctl.8 ++++ b/man/cupsctl.8 +@@ -73,19 +73,19 @@ Display the current settings: Enable debug logging: .nf @@ -169,10 +170,10 @@ index 6fab9036d..9a70580b8 100644 .fi .SH KNOWN ISSUES You cannot set the Listen or Port directives using \fBcupsctl\fR. -diff --git a/man/cupsd-logs.man b/man/cupsd-logs.man -index f7e43a928..5d673a3fe 100644 ---- a/man/cupsd-logs.man -+++ b/man/cupsd-logs.man +diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5 +index 2070be9a5..a912c4693 100644 +--- a/man/cupsd-logs.5 ++++ b/man/cupsd-logs.5 @@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by For example: .nf @@ -253,11 +254,11 @@ index f7e43a928..5d673a3fe 100644 .SH SEE ALSO .BR cupsd (8), .BR cupsd.conf (5), -diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in -index c9b5a287b..ac00fa191 100644 ---- a/man/cupsd.conf.man.in -+++ b/man/cupsd.conf.man.in -@@ -448,7 +448,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne +diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 +index 75d060279..5788265fa 100644 +--- a/man/cupsd.conf.5 ++++ b/man/cupsd.conf.5 +@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients. The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The \fIDenyCBC\fR option disables all CBC cipher suites. @@ -266,11 +267,11 @@ index c9b5a287b..ac00fa191 100644 The \fIMinTLS\fR options set the minimum TLS version to support. The \fIMaxTLS\fR options set the maximum TLS version to support. Not all operating systems support TLS 1.3 at this time. -diff --git a/man/cupsfilter.man b/man/cupsfilter.man -index e1aa836f2..f0400c1dc 100644 ---- a/man/cupsfilter.man -+++ b/man/cupsfilter.man -@@ -121,7 +121,7 @@ command use the current user and security session. This may result in different +diff --git a/man/cupsfilter.8 b/man/cupsfilter.8 +index c655c21c0..fe4c5a2cf 100644 +--- a/man/cupsfilter.8 ++++ b/man/cupsfilter.8 +@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf": .nf @@ -279,11 +280,11 @@ index e1aa836f2..f0400c1dc 100644 .fi .SH SEE ALSO .BR cups (1), -diff --git a/man/filter.man b/man/filter.man -index 9bbc49770..8e2721da9 100644 ---- a/man/filter.man -+++ b/man/filter.man -@@ -135,7 +135,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd +diff --git a/man/filter.7 b/man/filter.7 +index dbc3150c8..8cb79bbf9 100644 +--- a/man/filter.7 ++++ b/man/filter.7 +@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd .TP 5 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ] .TP 5 @@ -292,10 +293,34 @@ index 9bbc49770..8e2721da9 100644 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer. .TP 5 \fBWARNING:\fI message\fR -diff --git a/man/ippfind.man b/man/ippfind.man -index 65f7c8ea3..cbd409c3d 100644 ---- a/man/ippfind.man -+++ b/man/ippfind.man +diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1 +index 0fb4c2416..6a4b7e11e 100644 +--- a/man/ippeveprinter.1 ++++ b/man/ippeveprinter.1 +@@ -122,8 +122,8 @@ If "command" is not an absolute path ("/path/to/command"), + looks for the command in the "ippeveprinter" subdirectory of the CUPS binary directory, typically /usr/lib/cups/ippeveprinter or /usr/libexec/cups/ippeveprinter. + The + .BR cups-config (1) +-command can be used to discover the correct binary directory ("cups-config --serverbin"). +-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the ++command can be used to discover the correct binary directory ("cups-config \--serverbin"). ++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the + .BR cups (1) + man page for more details. + .TP 5 +@@ -220,7 +220,7 @@ Logs an informational/progress message if \-v has been specified and copies the + \fBSTATE: \fIkeyword[,keyword,...]\fR + Sets the printer's "printer-state-reasons" attribute to the listed keywords. + .TP 5 +-\fBSTATE: -\fIkeyword[,keyword,...]\fR ++\fBSTATE: \-\fIkeyword[,keyword,...]\fR + Removes the listed keywords from the printer's "printer-state-reasons" attribute. + .TP 5 + \fBSTATE: +\fIkeyword[,keyword,...]\fR +diff --git a/man/ippfind.1 b/man/ippfind.1 +index 32f2e6f8b..d77ef75cc 100644 +--- a/man/ippfind.1 ++++ b/man/ippfind.1 @@ -75,7 +75,7 @@ True is the hostname matches the given regular expression. .B \-l .TP 5 @@ -323,11 +348,11 @@ index 65f7c8ea3..cbd409c3d 100644 .PP Expressions may also contain modifiers: .TP 5 -diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man -index b50fd6d14..c97ba8c92 100644 ---- a/man/ipptoolfile.man -+++ b/man/ipptoolfile.man -@@ -165,8 +165,8 @@ The following directives are understood within a \fItest\fR: +diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5 +index fd2aec332..e1a710865 100644 +--- a/man/ipptoolfile.5 ++++ b/man/ipptoolfile.5 +@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR: \fBATTR \fItag attribute-name value(s)\fR Adds an attribute to the test request. Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value. @@ -338,7 +363,7 @@ index b50fd6d14..c97ba8c92 100644 .TP 5 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR] Adds a collection attribute to the test request. -@@ -193,7 +193,7 @@ test report. +@@ -194,7 +194,7 @@ test report. \fBEXPECT ?\fIattribute-name predicate(s)\fR .TP 5 \fBEXPECT !\fIattribute-name\fR @@ -347,7 +372,7 @@ index b50fd6d14..c97ba8c92 100644 .TP 5 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR] .TP 5 -@@ -245,7 +245,7 @@ Specifies whether +@@ -246,7 +246,7 @@ Specifies whether will skip the current test if the previous test resulted in an error/failure. .TP 5 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ] @@ -356,10 +381,10 @@ index b50fd6d14..c97ba8c92 100644 .TP 5 \fBTEST\-ID "\fIidentifier\fR" Specifies an identifier string for the current test. -diff --git a/man/lp.man b/man/lp.man -index 9cde2c5ee..07ce95567 100644 ---- a/man/lp.man -+++ b/man/lp.man +diff --git a/man/lp.1 b/man/lp.1 +index cbea3b840..839a48278 100644 +--- a/man/lp.1 ++++ b/man/lp.1 @@ -83,7 +83,7 @@ lp \- print files ] .SH DESCRIPTION @@ -410,11 +435,11 @@ index 9cde2c5ee..07ce95567 100644 .fi .SH SEE ALSO .BR cancel (1), -diff --git a/man/lpadmin.man b/man/lpadmin.man -index 61d903379..5491d722b 100644 ---- a/man/lpadmin.man -+++ b/man/lpadmin.man -@@ -119,7 +119,7 @@ command. +diff --git a/man/lpadmin.8 b/man/lpadmin.8 +index 1b8c91ba4..ce6a698ff 100644 +--- a/man/lpadmin.8 ++++ b/man/lpadmin.8 +@@ -120,7 +120,7 @@ command. .TP 5 \fB\-o \fIname\fB-default=\fIvalue\fR Sets a default server-side option for the destination. @@ -423,7 +448,7 @@ index 61d903379..5491d722b 100644 .TP 5 \fB\-o port\-monitor=\fIname\fR Sets the binary communications program to use when printing, "none", "bcp", or "tbcp". -@@ -161,7 +161,7 @@ If the resulting class becomes empty it is removed. +@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed. Sets user-level access control on a destination. Names starting with "@" are interpreted as UNIX groups. The latter two forms turn user-level access control off. @@ -432,7 +457,7 @@ index 61d903379..5491d722b 100644 .TP 5 \fB\-v "\fIdevice-uri\fB"\fR Sets the \fIdevice-uri\fR attribute of the printer queue. -@@ -213,7 +213,7 @@ These files should not be edited directly and are an implementation detail of CU +@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU Create an IPP Everywhere print queue: .nf @@ -441,11 +466,11 @@ index 61d903379..5491d722b 100644 .fi .SH SEE ALSO -diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in -index b5d4a9daa..df1cf5500 100644 ---- a/man/lpoptions.man.in -+++ b/man/lpoptions.man.in -@@ -101,9 +101,9 @@ Destinations can only be removed using the +diff --git a/man/lpoptions.1 b/man/lpoptions.1 +index a34fd01dc..7550d9afb 100644 +--- a/man/lpoptions.1 ++++ b/man/lpoptions.1 +@@ -102,9 +102,9 @@ Destinations can only be removed using the .BR lpadmin (8) command. .SH FILES @@ -457,10 +482,10 @@ index b5d4a9daa..df1cf5500 100644 .SH CONFORMING TO The \fBlpoptions\fR command is unique to CUPS. .SH SEE ALSO -diff --git a/man/lpr.man b/man/lpr.man -index cae4ac041..00da1bc36 100644 ---- a/man/lpr.man -+++ b/man/lpr.man +diff --git a/man/lpr.1 b/man/lpr.1 +index f367cd97c..635d126d6 100644 +--- a/man/lpr.1 ++++ b/man/lpr.1 @@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees). \fB\-o print\-quality=4\fR .TP 5 @@ -493,11 +518,11 @@ index cae4ac041..00da1bc36 100644 .fi .SH SEE ALSO .BR cancel (1), -diff --git a/man/mime.convs.man b/man/mime.convs.man -index 83be3bcf4..a1338d891 100644 ---- a/man/mime.convs.man -+++ b/man/mime.convs.man -@@ -34,11 +34,11 @@ A value of 100 means that the filter uses a large amount of resources while a va +diff --git a/man/mime.convs.5 b/man/mime.convs.5 +index 25a6f7653..04ba39494 100644 +--- a/man/mime.convs.5 ++++ b/man/mime.convs.5 +@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va The \fIfilter\fR field specifies the filter program filename. Filenames are relative to the CUPS filter directory. .SH FILES @@ -512,11 +537,11 @@ index 83be3bcf4..a1338d891 100644 .SH EXAMPLES Define a filter that converts PostScript documents to CUPS Raster format: .nf -diff --git a/man/mime.types.man b/man/mime.types.man -index 77b0c913e..c18ee0a3a 100644 ---- a/man/mime.types.man -+++ b/man/mime.types.man -@@ -34,7 +34,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information. +diff --git a/man/mime.types.5 b/man/mime.types.5 +index 7e83de16a..3572726f5 100644 +--- a/man/mime.types.5 ++++ b/man/mime.types.5 +@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information. .LP The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!". .SS RULES @@ -525,7 +550,7 @@ index 77b0c913e..c18ee0a3a 100644 values inside parenthesis. The following functions are available: .TP 5 -@@ -84,7 +84,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is +@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is alphanumerically smaller than "text/foo". However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead. .SH FILES @@ -534,16 +559,16 @@ index 77b0c913e..c18ee0a3a 100644 .SH EXAMPLES Define two MIME media types for raster data, with one being a subset with higher priority: .nf -diff --git a/man/ppdc.man b/man/ppdc.man -index c59c3e940..7e78a7f47 100644 ---- a/man/ppdc.man -+++ b/man/ppdc.man -@@ -84,7 +84,7 @@ The default is to generate uncompressed PPD files. +diff --git a/man/ppdc.1 b/man/ppdc.1 +index 44e9d2448..38e266978 100644 +--- a/man/ppdc.1 ++++ b/man/ppdc.1 +@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files. \fB\-\-crlf\fR .TP 5 \fB\-\-lf\fR -Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone. +Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone. The default is to use the line feed character alone. - .SH SEE ALSO - .BR ppdhtml (1), + .SH NOTES + PPD files are deprecated and will no longer be supported in a future feature release of CUPS. diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch index c050e4f90..e76793fdd 100644 --- a/debian/patches/manpage-translations.patch +++ b/debian/patches/manpage-translations.patch @@ -1,4 +1,4 @@ -From 91981a9214c524b9054d30bd755d930ad2ad8a6d Mon Sep 17 00:00:00 2001 +From 01a633a48c666c5b9e9d799abd71dabbb680458e 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. @@ -12,22 +12,22 @@ Bug-Debian: http://bugs.debian.org/478597 Patch-Name: manpage-translations.patch --- - man/Makefile | 15 ++- + man/Makefile | 17 +++- man/Makefile.l10n | 244 ++++++++++++++++++++++++++++++++++++++++++++++ man/de/Makefile | 7 ++ man/fr/Makefile | 7 ++ - 4 files changed, 272 insertions(+), 1 deletion(-) + 4 files changed, 273 insertions(+), 2 deletions(-) create mode 100644 man/Makefile.l10n create mode 100644 man/de/Makefile create mode 100644 man/fr/Makefile diff --git a/man/Makefile b/man/Makefile -index 5d5d0ee4f..d85660691 100644 +index e01591a93..48f06c48a 100644 --- a/man/Makefile +++ b/man/Makefile -@@ -60,12 +60,18 @@ MAN8 = cupsaccept.$(MAN8EXT) \ - lpmove.$(MAN8EXT) \ - lpc.$(MAN8EXT) +@@ -63,12 +63,18 @@ MAN8 = cupsaccept.8 \ + lpmove.8 \ + lpc.8 +LANGUAGES=de fr @@ -45,10 +45,11 @@ index 5d5d0ee4f..d85660691 100644 # -@@ -89,6 +95,11 @@ unittests: +@@ -91,6 +97,12 @@ unittests: + clean: $(RM) mantohtml mantohtml.o - $(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8) ++ $(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8) + for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done + # Make sure the PO files are updated and remove generated + # translations. @@ -57,19 +58,20 @@ index 5d5d0ee4f..d85660691 100644 # -@@ -140,6 +151,7 @@ install-data: all - $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ - $(LN) cupsd-helper.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ +@@ -142,6 +154,7 @@ install-data: all + $(RM) $(MANDIR)/man8/$$file; \ + $(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \ done + for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done # -@@ -188,6 +200,7 @@ uninstall: - $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) - $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) - -$(RMDIR) $(AMANDIR)/man$(MAN8DIR) -+ for lang in $(LANGUAGES); do $(MAKE) -C $$lang uninstall; done +@@ -189,7 +202,7 @@ uninstall: + for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \ + $(RM) $(MANDIR)/man8/$$file; \ + done +- -$(RMDIR) $(MANDIR)/man8 ++ -$(RMDIR) $(AMANDIR)/man$(MAN8DIR) # diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch index 541228704..e0b21ab74 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 2e93370f4afda4c6c70c90bd87f36f6b127ac6e7 Mon Sep 17 00:00:00 2001 +From fa343565c53cacb148bcfaaee3249eb8ca5e51cc 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 @@ -15,10 +15,10 @@ Patch-Name: move-cupsd-conf-default-to-share.patch 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c -index e87e32f1d..5b39532f1 100644 +index f8c57639f..fa4d82c2d 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c -@@ -1632,6 +1632,7 @@ do_config_server(http_t *http) /* I - HTTP connection */ +@@ -1629,6 +1629,7 @@ do_config_server(http_t *http) /* I - HTTP connection */ int ch; /* Character from file */ char filename[1024]; /* Filename */ const char *server_root; /* Location of config files */ @@ -26,7 +26,7 @@ index e87e32f1d..5b39532f1 100644 /* -@@ -1715,7 +1716,10 @@ do_config_server(http_t *http) /* I - HTTP connection */ +@@ -1712,7 +1713,10 @@ do_config_server(http_t *http) /* I - HTTP connection */ * well... */ diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch index 2a406c7bd..bdb9d73c0 100644 --- a/debian/patches/no-conffile-timestamp.patch +++ b/debian/patches/no-conffile-timestamp.patch @@ -1,4 +1,4 @@ -From 80d8b050fdb784a61c88e49431f22775d6bb3ff2 Mon Sep 17 00:00:00 2001 +From c0965afd3a25dac40af3c81ce07f0d3ec9f536ae 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 @@ -29,10 +29,10 @@ index 776e79a91..ec6357ffe 100644 /* diff --git a/scheduler/job.c b/scheduler/job.c -index de22a5f55..8e9e5ba55 100644 +index 81acecdfa..c39bd09d3 100644 --- a/scheduler/job.c +++ b/scheduler/job.c -@@ -2202,7 +2202,7 @@ cupsdSaveAllJobs(void) +@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void) strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate); cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n"); @@ -42,10 +42,10 @@ index de22a5f55..8e9e5ba55 100644 /* diff --git a/scheduler/printers.c b/scheduler/printers.c -index 554703dc9..8c25bd66b 100644 +index 2578aa76b..149eaac7e 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c -@@ -1509,7 +1509,7 @@ cupsdSaveAllPrinters(void) +@@ -1508,7 +1508,7 @@ cupsdSaveAllPrinters(void) strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate); cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n"); @@ -55,10 +55,10 @@ index 554703dc9..8c25bd66b 100644 cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId); diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c -index 36bf29ceb..401e6c8c0 100644 +index 0908f3c0c..71892c7f4 100644 --- a/scheduler/subscriptions.c +++ b/scheduler/subscriptions.c -@@ -1081,7 +1081,7 @@ cupsdSaveAllSubscriptions(void) +@@ -1084,7 +1084,7 @@ cupsdSaveAllSubscriptions(void) strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate); cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n"); diff --git a/debian/patches/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch index 510cc84e6..3ccb7d583 100644 --- a/debian/patches/pwg-raster-attributes.patch +++ b/debian/patches/pwg-raster-attributes.patch @@ -1,4 +1,4 @@ -From 6743d6f9640dba30c69ace1bb21662e70743824b Mon Sep 17 00:00:00 2001 +From 0fa4ad7a58d6d846223446cbe7f454838c185722 Mon Sep 17 00:00:00 2001 From: Till Kamppeter <till.kamppeter@gmail.com> Date: Tue, 9 Aug 2016 18:11:04 +0200 Subject: For PWG Raster, add required IPP attributes @@ -14,10 +14,10 @@ Patch-Name: pwg-raster-attributes.patch 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/scheduler/printers.c b/scheduler/printers.c -index ff381cdd5..7b7e68367 100644 +index e4841c071..1984a659c 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c -@@ -2255,9 +2255,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ +@@ -2254,9 +2254,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ cupsd_location_t *auth; /* Pointer to authentication element */ const char *auth_supported; /* Authentication supported */ ipp_t *oldattrs; /* Old printer attributes */ @@ -29,7 +29,7 @@ index ff381cdd5..7b7e68367 100644 /* -@@ -2590,6 +2591,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ +@@ -2589,6 +2590,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ add_printer_formats(p); diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch index e3a603617..cea2047c8 100644 --- a/debian/patches/reactivate_recommended_driver.patch +++ b/debian/patches/reactivate_recommended_driver.patch @@ -1,4 +1,4 @@ -From 99d3f374c8d1fba6945ea224170007626ebbe19f Mon Sep 17 00:00:00 2001 +From 6da4266ba23291298cdaaf878738727c24482690 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 @@ -13,10 +13,10 @@ Patch-Name: reactivate_recommended_driver.patch 1 file changed, 10 deletions(-) diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx -index b518a9325..3f51e2a0e 100644 +index 85516eb8c..874eb3c07 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx -@@ -242,7 +242,6 @@ add_ppd(const char *filename, /* I - PPD filename */ +@@ -240,7 +240,6 @@ add_ppd(const char *filename, /* I - PPD filename */ const char *scheme) /* I - PPD scheme */ { ppd_info_t *ppd; /* PPD */ @@ -24,7 +24,7 @@ index b518a9325..3f51e2a0e 100644 /* -@@ -280,15 +279,6 @@ add_ppd(const char *filename, /* I - PPD filename */ +@@ -278,15 +277,6 @@ add_ppd(const char *filename, /* I - PPD filename */ strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id)); strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme)); diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch index eb9bccf31..ddffc4816 100644 --- a/debian/patches/removecvstag.patch +++ b/debian/patches/removecvstag.patch @@ -1,4 +1,4 @@ -From 8d4abe846440efc1ce0fd75e7d43c0b53454cd38 Mon Sep 17 00:00:00 2001 +From 6a01ba1557ddbfb839b77649df982a06051614a0 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 428a160e0..a8f8c6314 100644 --- a/debian/patches/rename-systemd-units.patch +++ b/debian/patches/rename-systemd-units.patch @@ -1,4 +1,4 @@ -From 622f1caccbcc9ec36491de0f7439d8cccbae5a47 Mon Sep 17 00:00:00 2001 +From afbeed89693cea6037dbc1ca46b04708597fa428 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.* @@ -36,10 +36,10 @@ index 0f1cc46f2..7c8509fa6 100644 [Path] PathExists=@CUPS_CACHEDIR@/org.cups.cupsd diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in -index f2afa1124..3c273612a 100644 +index 5273762fb..cd2334396 100644 --- a/scheduler/org.cups.cupsd.service.in +++ b/scheduler/org.cups.cupsd.service.in -@@ -8,5 +8,5 @@ Type=simple +@@ -9,5 +9,5 @@ Type=simple Restart=on-failure [Install] diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch index f769aa227..7fcd76663 100644 --- a/debian/patches/show-compile-command-lines.patch +++ b/debian/patches/show-compile-command-lines.patch @@ -1,4 +1,4 @@ -From 6031680a3f8dc038da4a7c96da252ffd25d76135 Mon Sep 17 00:00:00 2001 +From f65476c14197d5fee37ccd3c2ac64bf74bc69532 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 @@ -9,10 +9,10 @@ Patch-Name: show-compile-command-lines.patch 1 file changed, 1 deletion(-) diff --git a/Makedefs.in b/Makedefs.in -index f96a5e9bf..367f73c81 100644 +index e345e2fd1..92850dbcc 100644 --- a/Makedefs.in +++ b/Makedefs.in -@@ -262,7 +262,6 @@ USBQUIRKS = @USBQUIRKS@ +@@ -264,7 +264,6 @@ USBQUIRKS = @USBQUIRKS@ # Rules... # diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch index cf22ea8f7..733ea74e1 100644 --- a/debian/patches/test-i18n-nonlinux.patch +++ b/debian/patches/test-i18n-nonlinux.patch @@ -1,4 +1,4 @@ -From fc4501a5dbf1d43b3c0e5c3f337ec33ff56fae48 Mon Sep 17 00:00:00 2001 +From cbbf16b4bfa904c6cacf7d3fac51795a673f3434 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 f3124496f..164138e14 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 7367e6801eb55d919e3e80fb9012831948bf37a5 Mon Sep 17 00:00:00 2001 +From b2a0fef331260dc596caed9995f555ff8ed55481 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 67ce1ee8d..e4069d71a 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 c8878cdcffcdb682deca0f8f7b30ba94bc43de7a Mon Sep 17 00:00:00 2001 +From c5cbc65c080f3267ff07849549b5f42817f022c2 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,10 +13,10 @@ 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 120fe3c32..d99b3dd0d 100755 +index ff1003eae..4c11f0a99 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -964,6 +964,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' +@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' $GREP -v '(dnssd) stopped with status 1' | \ $GREP -v 'loadFile failed: temp file: not a PDF file' | \ $GREP -v 'Failed to connect to system bus' | \ 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 91807b30a..f509a3859 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 4bfb2e0fa91b5d776f13e9474f8c791ec02f4133 Mon Sep 17 00:00:00 2001 +From dfd50d856ce36ad8b4040b1a4cb270fe9aa7a18c 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,10 +13,10 @@ 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 f62b28a00..120fe3c32 100755 +index 09eb97afe..ff1003eae 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -962,6 +962,8 @@ fi +@@ -1028,6 +1028,8 @@ fi count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \ $GREP -v '(usb) crashed on signal 11' | \ $GREP -v '(dnssd) stopped with status 1' | \ 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 725376f0c..ae315508e 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 2e991ead5c056a856b27fa1b93f5bde74a3d1bd6 Mon Sep 17 00:00:00 2001 +From 9d6ae5f0d8cc78a7fad136c38f3da949baa9a8c3 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,10 +14,10 @@ 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 d99b3dd0d..9a4a918d9 100755 +index 4c11f0a99..4f74dbad3 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -965,6 +965,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' +@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' $GREP -v 'loadFile failed: temp file: not a PDF file' | \ $GREP -v 'Failed to connect to system bus' | \ $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \ diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch index db0d5a85c..09c1c98ea 100644 --- a/debian/patches/tests-ignore-usb-crash.patch +++ b/debian/patches/tests-ignore-usb-crash.patch @@ -1,4 +1,4 @@ -From 575b813ae16b72b56ece3655101006d5a67a0b5d Mon Sep 17 00:00:00 2001 +From b44788365f6c41641d594de09d22faee3402df47 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,10 +17,10 @@ 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 0664f70fb..f62b28a00 100755 +index 4905b726e..09eb97afe 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -959,7 +959,10 @@ else +@@ -1025,7 +1025,10 @@ else fi # Error log messages diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch index 98e23238b..7c65e8947 100644 --- a/debian/patches/tests-ignore-warnings.patch +++ b/debian/patches/tests-ignore-warnings.patch @@ -1,4 +1,4 @@ -From b67731499e4a2f45df6631581c856e590ca5d743 Mon Sep 17 00:00:00 2001 +From 625b3fd3961894f7e261306b26b768af59ee022b 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,10 +13,10 @@ 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 92c6eb4de..0664f70fb 100755 +index 64322d68c..4905b726e 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -974,7 +974,11 @@ else +@@ -1040,7 +1040,11 @@ else fi # Warning log messages diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch index 478667aa8..0943e2bcf 100644 --- a/debian/patches/tests-make-lpstat-call-reproducible.patch +++ b/debian/patches/tests-make-lpstat-call-reproducible.patch @@ -1,4 +1,4 @@ -From 77d2490f40b6056bf140cda37fe7d8b7f5acafc7 Mon Sep 17 00:00:00 2001 +From e0ac591abb9d3fa2580bf06aad52ef5cfdc7bff5 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 @@ -13,10 +13,10 @@ 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 1b62797ba..0fccd08f9 100755 +index 6d6aaef9c..8c70f3e27 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -634,6 +634,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run +@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch index f9a4303aa..d3dd5b324 100644 --- a/debian/patches/tests-no-pdftourf.patch +++ b/debian/patches/tests-no-pdftourf.patch @@ -1,4 +1,4 @@ -From d446e120e33894a1946a247b57892750a2deee7a Mon Sep 17 00:00:00 2001 +From b468f9abec57a8ad71956c59e3fb59c68979d412 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 0fccd08f9..8ca50d106 100755 +index 8c70f3e27..4903484a2 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 0183231a9..df593407f 100644 --- a/debian/patches/tests-use-ipv4-lo-address.patch +++ b/debian/patches/tests-use-ipv4-lo-address.patch @@ -1,4 +1,4 @@ -From 17be6e0260c807b5ce2c5bb5857275c744fef556 Mon Sep 17 00:00:00 2001 +From 8dbb3c94c9c3c71fc3c9e9814873b1fb5e381290 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 @@ -30,10 +30,10 @@ index 7efc39892..08b8c508f 100644 echo " FAILED" exit 1 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh -index e59363ec5..1b62797ba 100755 +index 0bb955749..6d6aaef9c 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -482,7 +482,7 @@ fi +@@ -490,7 +490,7 @@ fi cat >$BASE/cupsd.conf <<EOF StrictConformance Yes Browsing Off @@ -42,7 +42,7 @@ index e59363ec5..1b62797ba 100755 Listen $BASE/sock MaxSubscriptions 3 MaxLogSize 0 -@@ -609,7 +609,7 @@ fi +@@ -617,7 +617,7 @@ fi # These get exported because they don't have side-effects... CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT @@ -51,10 +51,10 @@ index e59363ec5..1b62797ba 100755 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT CUPS_STATEDIR=$BASE; export CUPS_STATEDIR CUPS_DATADIR=$BASE/share; export CUPS_DATADIR -@@ -735,10 +735,10 @@ for file in 4*.test ipp-2.1.test; do +@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile - if test $file = ipp-2.1.test; then + if test $file = ../examples/ipp-2.1.test; then - uri="ipp://localhost:$port/printers/Test1" + uri="ipp://127.0.0.1:$port/printers/Test1" options="-V 2.1 -d NOPRINT=1 -f testfile.ps" @@ -63,4 +63,4 @@ index e59363ec5..1b62797ba 100755 + uri="ipp://127.0.0.1:$port/printers" options="" fi - $runcups $VALGRIND ./ipptool -tI $options $uri $file >> $strfile + $runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch index 74fd1f917..f5b9b4251 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 31ef776837136b7fef9fa3ff5e73e1136b3e7f51 Mon Sep 17 00:00:00 2001 +From 2d92d507c03a7d7b63b3c556ed5f1372e9a6d7f5 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,10 +14,10 @@ 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 9a4a918d9..e59363ec5 100755 +index 4f74dbad3..0bb955749 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -768,6 +768,11 @@ echo " $date by $user on `hostname`." >>$strfile +@@ -776,6 +776,11 @@ echo " $date by $user on `hostname`." >>$strfile echo " <pre>" >>$strfile for file in 5*.sh; do |