diff options
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/changelog | 24 | ||||
| -rw-r--r-- | debian/patches/0038-Allow-cupsd-daemon-to-exit-on-idle.patch | 26 | ||||
| -rw-r--r-- | debian/patches/manpage-translations.patch | 6 | ||||
| -rw-r--r-- | debian/patches/printer-filtering.patch | 2 | ||||
| -rw-r--r-- | debian/patches/pwg-raster-attributes.patch | 2 | ||||
| -rw-r--r-- | debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | scheduler/org.cups.cupsd.service.in | 2 |
9 files changed, 60 insertions, 9 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 3f3465ce6..fff3c6ef2 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -07ff85b39136c7ef34902c67ee964c1edcdd0045 -07ff85b39136c7ef34902c67ee964c1edcdd0045 +bd441a4ada2de29e1821bf4e51604d46137e0302 +bd441a4ada2de29e1821bf4e51604d46137e0302 b056061b241f8a2660186794c01689dce5aaa15a b056061b241f8a2660186794c01689dce5aaa15a cups_2.3~b3.orig.tar.gz diff --git a/debian/changelog b/debian/changelog index 433c7bf41..1e9d1f570 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cups (2.3~b4-3) experimental; urgency=medium + + * Merge 2.2.7-4, rebase patches + + -- Didier Raboud <odyx@debian.org> Wed, 16 May 2018 21:38:01 +0200 + cups (2.3~b4-2) experimental; urgency=medium * Merge 2.2.7-2 @@ -37,6 +43,24 @@ cups (2.3~b3-1) experimental; urgency=medium -- Didier Raboud <odyx@debian.org> Fri, 23 Feb 2018 20:49:53 +0100 +cups (2.2.7-4) unstable; urgency=medium + + [ Helge Kreutzmann ] + * Update German man page (2187t) + + [ Didier Raboud ] + * Backport an upstream fix: + - Allow cupsd daemon to exit on idle (Closes: #898745) + + -- Didier Raboud <odyx@debian.org> Wed, 16 May 2018 21:16:04 +0200 + +cups (2.2.7-3) unstable; urgency=medium + + * Backport an upstream fix: + - Fix another CUPS-Create-Local-Printer crash (Issue #5290) + + -- Didier Raboud <odyx@debian.org> Wed, 11 Apr 2018 17:05:27 +0200 + cups (2.2.7-2) unstable; urgency=medium * Autopkgtest: blacklist the now-deprecated 'raw' queues (Closes: #894643) diff --git a/debian/patches/0038-Allow-cupsd-daemon-to-exit-on-idle.patch b/debian/patches/0038-Allow-cupsd-daemon-to-exit-on-idle.patch new file mode 100644 index 000000000..5628b4487 --- /dev/null +++ b/debian/patches/0038-Allow-cupsd-daemon-to-exit-on-idle.patch @@ -0,0 +1,26 @@ +From 088f3aa8b7bc7d6faa8e86e97700b6b58a0e6a4b Mon Sep 17 00:00:00 2001 +From: FedericoYundt <FedericoYundt@users.noreply.github.com> +Date: Wed, 18 Apr 2018 08:40:59 +0100 +Subject: Allow cupsd daemon to exit on idle + +When using socket activation cups daemon can safely exit on idle and be automatically started when it's needed. Using Restart=always prevent this behavior and causes cups daemon constantly restarting itself instead of exiting. Users reported[1] that Restart=on-failure was enough to fix issues[2] so Restart=always may be unnecessary and harmful. + +[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861470 +[2] https://github.com/apple/cups/issues/5263 +--- + scheduler/org.cups.cupsd.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in +index 832169586..3c273612a 100644 +--- a/scheduler/org.cups.cupsd.service.in ++++ b/scheduler/org.cups.cupsd.service.in +@@ -5,7 +5,7 @@ Documentation=man:cupsd(8) + [Service] + ExecStart=@sbindir@/cupsd -l + Type=simple +-Restart=always ++Restart=on-failure + + [Install] + Also=cups.socket cups.path diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch index a242239f7..dae5daf8b 100644 --- a/debian/patches/manpage-translations.patch +++ b/debian/patches/manpage-translations.patch @@ -1,4 +1,4 @@ -From 07ff85b39136c7ef34902c67ee964c1edcdd0045 Mon Sep 17 00:00:00 2001 +From bd441a4ada2de29e1821bf4e51604d46137e0302 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,8 +12,8 @@ Bug-Debian: http://bugs.debian.org/478597 Patch-Name: manpage-translations.patch --- - man/Makefile | 15 +++- - man/Makefile.l10n | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + man/Makefile | 15 ++- + man/Makefile.l10n | 246 ++++++++++++++++++++++++++++++++++++++++++++++ man/de/Makefile | 7 ++ man/fr/Makefile | 7 ++ 4 files changed, 274 insertions(+), 1 deletion(-) diff --git a/debian/patches/printer-filtering.patch b/debian/patches/printer-filtering.patch index 81dbe9f08..1c599a6b3 100644 --- a/debian/patches/printer-filtering.patch +++ b/debian/patches/printer-filtering.patch @@ -9,7 +9,7 @@ Last-Update: 2015-10-02 === modified file 'cups-1.3.9/cups/ipp.c' Patch-Name: printer-filtering.patch --- - cups/ipp.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + cups/ipp.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/cups/ipp.c b/cups/ipp.c diff --git a/debian/patches/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch index c6a292cdf..30259e7c3 100644 --- a/debian/patches/pwg-raster-attributes.patch +++ b/debian/patches/pwg-raster-attributes.patch @@ -10,7 +10,7 @@ Bug-Upstream: https://www.cups.org/str.php?L4428 Last-Update: 2015-02-10 Patch-Name: pwg-raster-attributes.patch --- - scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++- + scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/scheduler/printers.c b/scheduler/printers.c 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 af24c703c..a144e98f5 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 @@ -15,7 +15,7 @@ Last-Update: 2015-02-10 Patch-Name: read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch --- - scheduler/ipp.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + scheduler/ipp.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/scheduler/ipp.c b/scheduler/ipp.c diff --git a/debian/patches/series b/debian/patches/series index 2d3430ca1..090eb2150 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,4 +35,5 @@ cups-set-default-error-policy-retry-job.patch man-cups-lpd-drop-dangling-references.patch debianize_cups-config.patch 0037-Build-mantohtml-with-the-build-architecture-compiler.patch +0038-Allow-cupsd-daemon-to-exit-on-idle.patch manpage-translations.patch diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in index 832169586..3c273612a 100644 --- a/scheduler/org.cups.cupsd.service.in +++ b/scheduler/org.cups.cupsd.service.in @@ -5,7 +5,7 @@ Documentation=man:cupsd(8) [Service] ExecStart=@sbindir@/cupsd -l Type=simple -Restart=always +Restart=on-failure [Install] Also=cups.socket cups.path |