diff options
| author | Didier Raboud <odyx@debian.org> | 2014-10-23 21:28:12 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-10-23 21:28:12 +0200 |
| commit | d7881fdc21094f4ab863b1b33b2c5db2545672c6 (patch) | |
| tree | 580d1992cecebebb058f38f800919ae31d1547ec | |
| parent | dbcc76b86e800f1341281680a2c26ce07f05f6af (diff) | |
| download | cups-d7881fdc21094f4ab863b1b33b2c5db2545672c6.tar.gz | |
Move a patch snippet to where it belongs
Git-Dch: None
| -rw-r--r-- | debian/patches/cupsd-idleexittimeout-systemd.patch | 10 | ||||
| -rw-r--r-- | debian/patches/systemd-optional-socket-activation.patch | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/debian/patches/cupsd-idleexittimeout-systemd.patch b/debian/patches/cupsd-idleexittimeout-systemd.patch index eea89dbe..be874fd7 100644 --- a/debian/patches/cupsd-idleexittimeout-systemd.patch +++ b/debian/patches/cupsd-idleexittimeout-systemd.patch @@ -49,16 +49,6 @@ Last-Update: 2014-06-04 return (0); } #endif /* HAVE_SYSTEMD */ ---- a/data/cups.service.in -+++ b/data/cups.service.in -@@ -1,6 +1,7 @@ - [Unit] - Description=CUPS Printing Service - Documentation=man:cupsd(8) man:cupsd.conf(5) -+Requires=cups.socket - - [Service] - ExecStart=@sbindir@/cupsd -f --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -521,6 +521,12 @@ diff --git a/debian/patches/systemd-optional-socket-activation.patch b/debian/patches/systemd-optional-socket-activation.patch index 0efa33c4..e7f0c808 100644 --- a/debian/patches/systemd-optional-socket-activation.patch +++ b/debian/patches/systemd-optional-socket-activation.patch @@ -23,7 +23,7 @@ Origin: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/f Origin: http://pkgs.fedoraproject.org/cgit/cups.git/tree/cups-systemd-socket.patch?id=7048cf473bca56b13d3c2f140fd749d561490784 From: Lennart Poettering <lennart@poettering.net> Author: Lennart Poettering <lennart@poettering.net> -Last-Update: 2014-07-23 +Last-Update: 2014-10-23 --- a/config.h.in +++ b/config.h.in @@ -451,6 +451,13 @@ @@ -123,10 +123,11 @@ Last-Update: 2014-07-23 +WantedBy=paths.target --- /dev/null +++ b/data/cups.service.in -@@ -0,0 +1,11 @@ +@@ -0,0 +1,12 @@ +[Unit] +Description=CUPS Printing Service +Documentation=man:cupsd(8) man:cupsd.conf(5) ++Requires=cups.socket + +[Service] +ExecStart=@sbindir@/cupsd -f |