diff options
Diffstat (limited to 'debian')
46 files changed, 71 insertions, 72 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index f2cd221de..d7a669857 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,7 +1,7 @@ # see git-dpm(1) from git-dpm package -a8518c5f1637f87199ccf6e2b171932f10b67351 -a8518c5f1637f87199ccf6e2b171932f10b67351 -10887d272a7edfbb774bc8173419b2281fe80aae +7ce65f2332eb3e8db55078f6f31486c8c09c6150 +7ce65f2332eb3e8db55078f6f31486c8c09c6150 +a2f30a72f7e1d4673e3720a41f28480e9cc21c48 a2f30a72f7e1d4673e3720a41f28480e9cc21c48 cups_2.2.1-56-ga2f30a72f.orig.tar.xz 52f644084a7677ac7d0299d5f80944092ac654d7 diff --git a/debian/gbp.conf b/debian/gbp.conf index 47e7402d9..b7a5f8fab 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,4 @@ [DEFAULT] -debian-branch = debian/master +debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True diff --git a/debian/patches/0042-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0042-Build-mantohtml-with-the-build-architecture-compiler.patch index 5ec68dd6b..67a9dedb8 100644 --- a/debian/patches/0042-Build-mantohtml-with-the-build-architecture-compiler.patch +++ b/debian/patches/0042-Build-mantohtml-with-the-build-architecture-compiler.patch @@ -1,4 +1,4 @@ -From 22d25a78cd8d91128ecdd4c864d75eb7ee52b79f Mon Sep 17 00:00:00 2001 +From 69863ef767edeb3e2bffe448a77e55604df00f58 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/0043-Do-not-execute-genstrings-during-build.patch b/debian/patches/0043-Do-not-execute-genstrings-during-build.patch index fd8613ced..9c00db101 100644 --- a/debian/patches/0043-Do-not-execute-genstrings-during-build.patch +++ b/debian/patches/0043-Do-not-execute-genstrings-during-build.patch @@ -1,4 +1,4 @@ -From 71d7d89d8eb1209c261783277d1f0589d096e1d6 Mon Sep 17 00:00:00 2001 +From 7564e2e24fbb76b85d3fe12b53e52dc290042c7a Mon Sep 17 00:00:00 2001 From: Helmut Grohne <helmut@subdivi.de> Date: Thu, 15 Sep 2016 07:59:13 +0200 Subject: Do not execute genstrings during build diff --git a/debian/patches/add-ipp-backend-of-cups-1.4.patch b/debian/patches/add-ipp-backend-of-cups-1.4.patch index 5c304a2f1..d3fe3ec01 100644 --- a/debian/patches/add-ipp-backend-of-cups-1.4.patch +++ b/debian/patches/add-ipp-backend-of-cups-1.4.patch @@ -1,4 +1,4 @@ -From 7371b549b6ceaca4d4b9942e523abf4006bd7f1a Mon Sep 17 00:00:00 2001 +From 0162d45904775642186eb9a32553b01c36e416b3 Mon Sep 17 00:00:00 2001 From: Till Kampetter <till.kampetter@gmail.com> Date: Tue, 9 Aug 2016 18:11:37 +0200 Subject: Add the IPP backend of CUPS 1.4.x to the current CUPS diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch index 2f49f7210..0e05a43ff 100644 --- a/debian/patches/airprint-support.patch +++ b/debian/patches/airprint-support.patch @@ -1,4 +1,4 @@ -From 5b4d4d12f493b1479e90418198df66531cf6d98a Mon Sep 17 00:00:00 2001 +From f7f36c25c68ec1475f5e6eacc750556ee6faa9d1 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 1c50f16a6..40ef6d1b1 100644 # # Text files... diff --git a/scheduler/conf.c b/scheduler/conf.c -index 0bb2b95d6..afb70df33 100644 +index f547749c6..d7e3d472f 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -745,7 +745,7 @@ cupsdReadConfiguration(void) diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch index df499a96c..db3646d9c 100644 --- a/debian/patches/confdirperms.patch +++ b/debian/patches/confdirperms.patch @@ -1,4 +1,4 @@ -From dfab7ccb586804b22f0372572de7a01e36482cff Mon Sep 17 00:00:00 2001 +From af26a48918fdb80781688b66d2d78eb3297a0579 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,10 +11,10 @@ Patch-Name: confdirperms.patch 1 file changed, 2 insertions(+) diff --git a/scheduler/conf.c b/scheduler/conf.c -index dc828bc25..5a5a5d477 100644 +index 018eb768c..0c0e5248c 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c -@@ -1133,10 +1133,12 @@ cupsdReadConfiguration(void) +@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void) Group, 1, 1) < 0 || cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser, Group, 1, 0) < 0 || 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 9195a5c7f..110e208cb 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 c76f2d3f02946ea991c4b0255f621ab1c3747332 Mon Sep 17 00:00:00 2001 +From b1bf6d59f9b077fc34f31f050ce2242c8a9ab9e9 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 ab1826583..07b128c30 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 de32370bdecef52eaf7c0f8c6d76d05e963b6ec4 Mon Sep 17 00:00:00 2001 +From bd5c052ba576e7427840768dae53455115ffc891 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 @@ -56,7 +56,7 @@ index 4cede48bd..92c97744c 100644 .TP 5 \fBFilterLimit \fIlimit\fR diff --git a/scheduler/conf.c b/scheduler/conf.c -index 01817f733..64016aa68 100644 +index 6870aff9a..7cc73de87 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -753,7 +753,7 @@ cupsdReadConfiguration(void) @@ -68,7 +68,7 @@ index 01817f733..64016aa68 100644 JobHistory = DEFAULT_HISTORY; JobFiles = DEFAULT_FILES; -@@ -1231,8 +1231,8 @@ cupsdReadConfiguration(void) +@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void) strcmp(ErrorPolicy, "retry-job") && strcmp(ErrorPolicy, "stop-printer")) { diff --git a/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch b/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch index 719ee88ff..363ea58de 100644 --- a/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch +++ b/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch @@ -1,4 +1,4 @@ -From bc1444e7848c60ffa000378d67cddcd19cbdb581 Mon Sep 17 00:00:00 2001 +From a4f2d27900ebb02a5ddb36704488ab84d2e8830d 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 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 18ffb2a46..092d604c7 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 d57c6cd2357fbf12c12ef009cdd57f202e1b1604 Mon Sep 17 00:00:00 2001 +From 68e8f9fd99aafb428516a1f94aac0261b8fe30d8 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 @@ -53,7 +53,7 @@ index 8e6218495..f39af9bc1 100644 .TP 5 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ] diff --git a/scheduler/conf.c b/scheduler/conf.c -index 22a9a1e70..01817f733 100644 +index 222397a80..6870aff9a 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -737,7 +737,7 @@ cupsdReadConfiguration(void) diff --git a/debian/patches/cupsd-upstart-support.patch b/debian/patches/cupsd-upstart-support.patch index 240ee0c2f..263c11cf9 100644 --- a/debian/patches/cupsd-upstart-support.patch +++ b/debian/patches/cupsd-upstart-support.patch @@ -1,4 +1,4 @@ -From 7f83810d2b7086e0c6d161742bb084c0fa261880 Mon Sep 17 00:00:00 2001 +From 307dd44ed494199850a6ec9745a1c50cb82012d9 Mon Sep 17 00:00:00 2001 From: Till Kamppeter <till.kamppeter@gmail.com> Date: Tue, 9 Aug 2016 18:11:08 +0200 Subject: CUPS Upstart socket activation diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch index 7c601a5d9..e7579d192 100644 --- a/debian/patches/debianize_cups-config.patch +++ b/debian/patches/debianize_cups-config.patch @@ -1,4 +1,4 @@ -From ab3e84f777b5f67b9f642637dd68b47db9a97207 Mon Sep 17 00:00:00 2001 +From a1451d48001f4291d8503a51df6cd40e5798430f 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 5207119d7..9906990cd 100644 --- a/debian/patches/default_log_settings.patch +++ b/debian/patches/default_log_settings.patch @@ -1,4 +1,4 @@ -From af255cf672ad7a31786c656fe26efe0d49bdf729 Mon Sep 17 00:00:00 2001 +From c7cdbd8958253345a0ee0d39ecd16219017748d1 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 3db145491..b9cb66f24 100644 --- a/debian/patches/do-not-broadcast-with-hostnames.patch +++ b/debian/patches/do-not-broadcast-with-hostnames.patch @@ -1,4 +1,4 @@ -From a288951f7ede8f6b75e8b529eba421a15a394d55 Mon Sep 17 00:00:00 2001 +From 9d2179d561b5567251cfb8a36f79a8f29f27e29b 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 16c23e8d5..dc828bc25 100644 +index 1bb7dcffa..018eb768c 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -899,7 +899,7 @@ cupsdReadConfiguration(void) diff --git a/debian/patches/drop_unnecessary_dependencies.patch b/debian/patches/drop_unnecessary_dependencies.patch index 3b2d7a64e..56fb8a0e1 100644 --- a/debian/patches/drop_unnecessary_dependencies.patch +++ b/debian/patches/drop_unnecessary_dependencies.patch @@ -1,4 +1,4 @@ -From 29b37e6e7ff7ba101cd90b7c02b1616bf648a4ea Mon Sep 17 00:00:00 2001 +From d662fce6161539f012c4a66ea039d977b83223ff 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 against 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 6a3404777..23d4a2dfd 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 fd4f4b165190e31071061d2d9659448aff4efc23 Mon Sep 17 00:00:00 2001 +From 14f73d0f45a852b8f349dc5eddca35dc3b4ad1ff 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 f461b36dd..51513497a 100644 --- a/debian/patches/log-debug-history-nearly-unlimited.patch +++ b/debian/patches/log-debug-history-nearly-unlimited.patch @@ -1,4 +1,4 @@ -From ebcb79d0f99d4e7936933f60d4e263b685625a38 Mon Sep 17 00:00:00 2001 +From d619f3428d45586137e8d329d65983362060f349 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 5a5a5d477..22a9a1e70 100644 +index 0c0e5248c..222397a80 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -723,7 +723,7 @@ cupsdReadConfiguration(void) diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch index 93fca92d8..18923b452 100644 --- a/debian/patches/logfiles_adm_readable.patch +++ b/debian/patches/logfiles_adm_readable.patch @@ -1,4 +1,4 @@ -From 40247a29c96272ea37be24f5b005130f733e16d4 Mon Sep 17 00:00:00 2001 +From f6fdf4186ec83a16a00d0056ec85eb99162b0903 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 50f718b25..01ae4021b 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 aa4550ed427bd7ed559239eab14b93a3da52a80b Mon Sep 17 00:00:00 2001 +From 31aecaffd45536f9de027d9831937213b02bbbc8 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-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch index 373244004..d6cc1bd6e 100644 --- a/debian/patches/manpage-hyphen-minus.patch +++ b/debian/patches/manpage-hyphen-minus.patch @@ -1,4 +1,4 @@ -From 0df6e6fc765e488238e4489f6465483c916333d0 Mon Sep 17 00:00:00 2001 +From ccf3ed1170c3d4c7753a86496f7eb1a2e2100dbc 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 diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch index 252280cf1..c5fc3c552 100644 --- a/debian/patches/manpage-translations.patch +++ b/debian/patches/manpage-translations.patch @@ -1,4 +1,4 @@ -From a8518c5f1637f87199ccf6e2b171932f10b67351 Mon Sep 17 00:00:00 2001 +From 7ce65f2332eb3e8db55078f6f31486c8c09c6150 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 1bfbb8276..e4a5e49a9 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 7eaf2d5e30bdbf2096e89814e0dd08862fb2d7ec Mon Sep 17 00:00:00 2001 +From 3bf694ef13c0ecc4a442258d76744e273af4df72 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 ea19754d9..c715d8d63 100644 --- a/debian/patches/no-conffile-timestamp.patch +++ b/debian/patches/no-conffile-timestamp.patch @@ -1,4 +1,4 @@ -From 237fc671a314c3f103d53edd7c1c4afdd62410a0 Mon Sep 17 00:00:00 2001 +From 071329b18a421ed6fe8714acf87ea584d06c7921 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/pidfile.patch b/debian/patches/pidfile.patch index 00c93349b..0b06ff388 100644 --- a/debian/patches/pidfile.patch +++ b/debian/patches/pidfile.patch @@ -1,4 +1,4 @@ -From 59a769ab2b96788c7819950eddec5af4b386618a Mon Sep 17 00:00:00 2001 +From b7e413e1e31dd3f15cbafad307b3aeb29438eb48 Mon Sep 17 00:00:00 2001 From: Martin Pitt <mpitt@debian.org> Date: Tue, 9 Aug 2016 18:11:32 +0200 Subject: Add support for creating pid files. @@ -16,7 +16,7 @@ Patch-Name: pidfile.patch 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/scheduler/conf.c b/scheduler/conf.c -index afb70df33..16c23e8d5 100644 +index d7e3d472f..1bb7dcffa 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -163,7 +163,8 @@ static const cupsd_var_t cupsfiles_vars[] = @@ -37,7 +37,7 @@ index afb70df33..16c23e8d5 100644 if (!strcmp(CUPS_DEFAULT_PRINTCAP, "/etc/printers.conf")) PrintcapFormat = PRINTCAP_SOLARIS; -@@ -3427,6 +3429,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ +@@ -3429,6 +3431,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ !_cups_strcasecmp(line, "SystemGroup") || !_cups_strcasecmp(line, "SystemGroupAuthKey") || !_cups_strcasecmp(line, "TempDir") || diff --git a/debian/patches/ppdc-dynamic-linking.patch b/debian/patches/ppdc-dynamic-linking.patch index 8755ad066..f612bb86f 100644 --- a/debian/patches/ppdc-dynamic-linking.patch +++ b/debian/patches/ppdc-dynamic-linking.patch @@ -1,4 +1,4 @@ -From d6f895e0ec5c53515386be8c85b5d09c79c8dc06 Mon Sep 17 00:00:00 2001 +From fa1a03a4b8b0c9130f53210a3167100bd20f1bf0 Mon Sep 17 00:00:00 2001 From: Sune Vuorela <debian@pusling.com> Date: Tue, 9 Aug 2016 18:11:44 +0200 Subject: Dynamically link ppdc, to work around segfault on mipsen. diff --git a/debian/patches/printer-filtering.patch b/debian/patches/printer-filtering.patch index 864d5eee8..973d04302 100644 --- a/debian/patches/printer-filtering.patch +++ b/debian/patches/printer-filtering.patch @@ -1,4 +1,4 @@ -From 88f333621478063e6f5d251082a1d479eb67bd6a Mon Sep 17 00:00:00 2001 +From ea01c4eaee0da0bde0cd6abbacad74bce7046a24 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/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch index 688d30a7d..677fddc2b 100644 --- a/debian/patches/pwg-raster-attributes.patch +++ b/debian/patches/pwg-raster-attributes.patch @@ -1,4 +1,4 @@ -From e6fad671bf4664e7264966d928c00a3496481a2c Mon Sep 17 00:00:00 2001 +From 42a493bcbf60eb0f2e190f3022ac26358eb702f3 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 diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch index ed2a5e7bd..e589e74db 100644 --- a/debian/patches/reactivate_recommended_driver.patch +++ b/debian/patches/reactivate_recommended_driver.patch @@ -1,4 +1,4 @@ -From 8875d62d0afb7a1054d57d73858470d1f2acc68f Mon Sep 17 00:00:00 2001 +From 119a0031628f318ab37e7039faf142a08630b86a 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 a7554f396..da2528dcd 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 ce915a073afb27d16c78924079850cac923be3a0 Mon Sep 17 00:00:00 2001 +From 4817a6e04e3c66326ccfd8d7632b998b2022ae2c 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 29b2bf632..3e596ea30 100644 --- a/debian/patches/removecvstag.patch +++ b/debian/patches/removecvstag.patch @@ -1,4 +1,4 @@ -From 9cc0a0b0aa32c453636299d7b3aec4fa11ac8c74 Mon Sep 17 00:00:00 2001 +From 096a3c2f5070f545a0ff78fa7dcf2437b114fad3 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 64eee5100..c2bfad50f 100644 --- a/debian/patches/rename-systemd-units.patch +++ b/debian/patches/rename-systemd-units.patch @@ -1,38 +1,36 @@ -From b97affec054a8e1b61d8178ec7db9c1d71675ebc Mon Sep 17 00:00:00 2001 +From cd44617f46a597b3dbdbee83098b9ff8d3b94dc1 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.* -Also adapt upstream's : - 7852449fe24db38dc47b09ba033c93b1b73dfcd6 - Update systemd config files (Issue #4935) - Patch-Name: rename-systemd-units.patch --- - scheduler/org.cups.cups-lpd.socket | 1 + - scheduler/org.cups.cupsd.path.in | 1 + + scheduler/org.cups.cups-lpd.socket | 2 +- + scheduler/org.cups.cupsd.path.in | 2 +- scheduler/org.cups.cupsd.service.in | 2 +- - scheduler/org.cups.cupsd.socket.in | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) + scheduler/org.cups.cupsd.socket.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket -index dd5288c62..eb8445905 100644 +index ed23f9dfd..eb8445905 100644 --- a/scheduler/org.cups.cups-lpd.socket +++ b/scheduler/org.cups.cups-lpd.socket -@@ -1,5 +1,6 @@ +@@ -1,6 +1,6 @@ [Unit] Description=CUPS LPD Server Socket +-PartOf=org.cups.cups-lpd.service +PartOf=cups-lpd.service [Socket] ListenStream=515 diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in -index 1bccc6f9d..7c8509fa6 100644 +index 0f1cc46f2..7c8509fa6 100644 --- a/scheduler/org.cups.cupsd.path.in +++ b/scheduler/org.cups.cupsd.path.in -@@ -1,5 +1,6 @@ +@@ -1,6 +1,6 @@ [Unit] Description=CUPS Scheduler +-PartOf=org.cups.cupsd.service +PartOf=cups.service [Path] @@ -49,12 +47,13 @@ index 0a27c769f..7a042481f 100644 +Also=cups.socket cups.path WantedBy=printer.target diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in -index b0928c51c..3c37d7213 100644 +index 613b977a6..3c37d7213 100644 --- a/scheduler/org.cups.cupsd.socket.in +++ b/scheduler/org.cups.cupsd.socket.in -@@ -1,5 +1,6 @@ +@@ -1,6 +1,6 @@ [Unit] Description=CUPS Scheduler +-PartOf=org.cups.cupsd.service +PartOf=cups.service [Socket] diff --git a/debian/patches/rootbackends-worldreadable.patch b/debian/patches/rootbackends-worldreadable.patch index 98eb9b4c8..e80b942d5 100644 --- a/debian/patches/rootbackends-worldreadable.patch +++ b/debian/patches/rootbackends-worldreadable.patch @@ -1,4 +1,4 @@ -From 6e37cbf1e6e3c3bcf87dab0e9ade75b02391d1de Mon Sep 17 00:00:00 2001 +From dec04b64b158cd7d8d66dda00e98e2fe9f1063c7 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. diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch index b0bb992bf..0fb986500 100644 --- a/debian/patches/show-compile-command-lines.patch +++ b/debian/patches/show-compile-command-lines.patch @@ -1,4 +1,4 @@ -From 47387a487fcda779d1d3d8317f3b2d55e04f779c Mon Sep 17 00:00:00 2001 +From a162d19c38902f985567274c6e2f773676884f7f 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 95ace3e4b..aad89ba1a 100644 --- a/debian/patches/test-i18n-nonlinux.patch +++ b/debian/patches/test-i18n-nonlinux.patch @@ -1,4 +1,4 @@ -From 5737ab12a08e14a024f4c9308ca677b104983cdf Mon Sep 17 00:00:00 2001 +From 044588a0df8b0a9607f4301c2d2a47cfceafc62e 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-mips-getjobs.patch b/debian/patches/tests-fix-mips-getjobs.patch index 6450eef4d..44dd8f01f 100644 --- a/debian/patches/tests-fix-mips-getjobs.patch +++ b/debian/patches/tests-fix-mips-getjobs.patch @@ -1,4 +1,4 @@ -From 5eec55db81cfa0d69917defda095af03d907af3a Mon Sep 17 00:00:00 2001 +From d38e58be5526eab033d86b3ccadfb280874ecfc6 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:20 +0200 Subject: Make some attributes optional in the IPP-1.1 3.2.6 GetJobs test, diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch index 818ceecd9..0347fdf87 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 4ede722cc1c59f42cdf9a5e65b427d10498cf252 Mon Sep 17 00:00:00 2001 +From 97026c16dbf3b7860e2b4676bce38479f720ba66 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 73e494e0b..9df1b4afa 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 6a50964fb024cebfa686de8292711cbefeaf90a6 Mon Sep 17 00:00:00 2001 +From e9fc9a86da60db1ebed89597436a2055f9fbbf16 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 81ba4b5ec..aa263e3e2 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 6dc9406eac3777c2e18ab9af165153e6db5cd6c3 Mon Sep 17 00:00:00 2001 +From 4ec5b55c22e7b8b326ed6c611624f105b2cb4515 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.pdf b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.pdf index 6a78d406f..134659004 100644 --- a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.pdf +++ b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.pdf @@ -1,4 +1,4 @@ -From 998073b3c225ac52565b36ac6f704c3289551831 Mon Sep 17 00:00:00 2001 +From b07e5395005dc7a591c719fc0eae88861c2b0538 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 679d56dec..54544a6ea 100644 --- a/debian/patches/tests-ignore-usb-crash.patch +++ b/debian/patches/tests-ignore-usb-crash.patch @@ -1,4 +1,4 @@ -From b5951a57340be9d7df27e61cd1fdfee51cefcfa3 Mon Sep 17 00:00:00 2001 +From c898a4a2ca3667a25de76d6e3a03d22a3f8e7cc8 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 6937ea6f3..c96c715e0 100644 --- a/debian/patches/tests-ignore-warnings.patch +++ b/debian/patches/tests-ignore-warnings.patch @@ -1,4 +1,4 @@ -From 78a639d675da8756fce18f8ca37fa0a99326db7e Mon Sep 17 00:00:00 2001 +From c4b12047a83551f01c088852ba954349421de3a0 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 621db1375..3ddee233d 100644 --- a/debian/patches/tests-make-lpstat-call-reproducible.patch +++ b/debian/patches/tests-make-lpstat-call-reproducible.patch @@ -1,4 +1,4 @@ -From 8ca345a53d0365ccda5aba26c95e1cd7422f8b44 Mon Sep 17 00:00:00 2001 +From a077a3a5e48c1434bddbbbf95887459e7c9ba911 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 529865b1c..9e18e6b22 100644 --- a/debian/patches/tests-no-pdftourf.patch +++ b/debian/patches/tests-no-pdftourf.patch @@ -1,4 +1,4 @@ -From b46de4fd2931bc4dc7f989f1993a891c38b324cb Mon Sep 17 00:00:00 2001 +From 1d03a8fee1e0e1987ff97968f202549feba08a52 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 diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch index 77500a6fd..cdee69734 100644 --- a/debian/patches/tests-use-ipv4-lo-address.patch +++ b/debian/patches/tests-use-ipv4-lo-address.patch @@ -1,4 +1,4 @@ -From ef29a7d04c3f2e68b83d7b045758a1cb2d99ab68 Mon Sep 17 00:00:00 2001 +From a2146ab84779b8f027df0405e7ff0117afd03db8 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 1cb801d8b..302017b82 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 450b1019e7991b2936608cfd53cfd1411b634d87 Mon Sep 17 00:00:00 2001 +From 5675c8d9a9c2fdac467732ffc2ba9907aa2643e3 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 |