diff options
| author | Didier Raboud <odyx@debian.org> | 2014-07-14 16:43:56 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-07-14 16:43:56 +0200 |
| commit | 1e111316497d1327d359f08dc10253296ba5506e (patch) | |
| tree | dcbed8a5f8bb704176a8a23099c7abc99e75c0a4 /debian | |
| parent | 2ead9a5dc9dc62515b502721a24d66fc9bf17d36 (diff) | |
| download | cups-1e111316497d1327d359f08dc10253296ba5506e.tar.gz | |
Refresh patches
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/airprint-support.patch | 2 | ||||
| -rw-r--r-- | debian/patches/color-management-extension.patch | 2 | ||||
| -rw-r--r-- | debian/patches/cupsd-write-systemd-Port.patch | 10 | ||||
| -rw-r--r-- | debian/patches/systemd-optional-socket-activation.patch | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch index 6b244f5e..51576bdb 100644 --- a/debian/patches/airprint-support.patch +++ b/debian/patches/airprint-support.patch @@ -8,7 +8,7 @@ Last-Update: 2013-02-20 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c -@@ -414,6 +414,12 @@ +@@ -416,6 +416,12 @@ keyvalue[count ][0] = "pdl"; keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript"; diff --git a/debian/patches/color-management-extension.patch b/debian/patches/color-management-extension.patch index de25bf57..64add342 100644 --- a/debian/patches/color-management-extension.patch +++ b/debian/patches/color-management-extension.patch @@ -429,7 +429,7 @@ Last-Update: 2014-01-04 * Do the request and get back a response... --- a/cups/cups.h +++ b/cups/cups.h -@@ -244,7 +244,10 @@ +@@ -240,7 +240,10 @@ CUPS_PRINTER_SCANNER = 0x2000000, /* Scanner-only device * @since CUPS 1.4/OS X 10.6@ */ CUPS_PRINTER_MFP = 0x4000000, /* Printer with scanning capabilities diff --git a/debian/patches/cupsd-write-systemd-Port.patch b/debian/patches/cupsd-write-systemd-Port.patch index 24811ca5..6e419998 100644 --- a/debian/patches/cupsd-write-systemd-Port.patch +++ b/debian/patches/cupsd-write-systemd-Port.patch @@ -146,7 +146,7 @@ Last-Update: 2014-03-05 */ cupsdLogMessage(CUPSD_LOG_ERROR, -@@ -3451,6 +3451,7 @@ +@@ -3476,6 +3476,7 @@ *out; /* Output file */ char buffer[16384]; /* Copy buffer */ ssize_t bytes; /* Number of bytes */ @@ -154,7 +154,7 @@ Last-Update: 2014-03-05 /* -@@ -3465,17 +3466,30 @@ +@@ -3490,17 +3491,30 @@ } /* @@ -187,7 +187,7 @@ Last-Update: 2014-03-05 /* * Copy from the request to the new config file... -@@ -3486,12 +3500,12 @@ +@@ -3511,12 +3525,12 @@ { cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to copy to config file \"%s\": %s", @@ -202,7 +202,7 @@ Last-Update: 2014-03-05 cupsdUnlinkOrRemoveFile(filename); return (HTTP_SERVER_ERROR); -@@ -3503,7 +3517,7 @@ +@@ -3528,7 +3542,7 @@ cupsFileClose(in); @@ -211,7 +211,7 @@ Last-Update: 2014-03-05 return (HTTP_SERVER_ERROR); /* -@@ -3517,8 +3531,15 @@ +@@ -3542,8 +3556,15 @@ * Set the NeedReload flag... */ diff --git a/debian/patches/systemd-optional-socket-activation.patch b/debian/patches/systemd-optional-socket-activation.patch index f3554e12..355f0cbe 100644 --- a/debian/patches/systemd-optional-socket-activation.patch +++ b/debian/patches/systemd-optional-socket-activation.patch @@ -101,7 +101,7 @@ Last-Update: 2014-03-03 doc/help/ref-cupsd-conf.html --- a/cups/usersys.c +++ b/cups/usersys.c -@@ -1050,7 +1050,7 @@ +@@ -1028,7 +1028,7 @@ struct stat sockinfo; /* Domain socket information */ if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && |