diff options
| author | Didier Raboud <odyx@debian.org> | 2014-10-22 13:34:26 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-10-22 13:37:35 +0200 |
| commit | 683683a15c116b8dd4d4e7ad25d7e8010811e606 (patch) | |
| tree | 5858475a6a83965cdf01f3756a835a64686c8b03 | |
| parent | d98901483ff61a45b5cf11ad62d51c723fbd99b7 (diff) | |
| download | cups-683683a15c116b8dd4d4e7ad25d7e8010811e606.tar.gz | |
Dropped the FINAL_CONTENT_TYPE revert, stick back to upstream
We're following RedHat here, see https://bugzilla.redhat.com/show_bug.cgi?id=1149244
| -rw-r--r-- | debian/patches/revert-upstream-change-to-FINAL_CONTENT_TYPE-to-fix-printing-to-remote-CUPS-servers.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/debian/patches/revert-upstream-change-to-FINAL_CONTENT_TYPE-to-fix-printing-to-remote-CUPS-servers.patch b/debian/patches/revert-upstream-change-to-FINAL_CONTENT_TYPE-to-fix-printing-to-remote-CUPS-servers.patch deleted file mode 100644 index f2179cb9..00000000 --- a/debian/patches/revert-upstream-change-to-FINAL_CONTENT_TYPE-to-fix-printing-to-remote-CUPS-servers.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Reverted upstream change to FINAL_CONTENT_TYPE in order to fix printing to remote CUPS servers -Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1010580 -Last-Updated: 2013-11-28 ---- a/scheduler/job.c -+++ b/scheduler/job.c -@@ -600,12 +600,7 @@ - - if (!job->printer->remote) - { -- for (filter = (mime_filter_t *)cupsArrayLast(filters); -- filter && filter->dst; -- filter = (mime_filter_t *)cupsArrayPrev(filters)) -- if (strcmp(filter->dst->super, "printer") || -- strcmp(filter->dst->type, job->printer->name)) -- break; -+ filter = (mime_filter_t *)cupsArrayLast(filters); - - if (filter && filter->dst) - { diff --git a/debian/patches/series b/debian/patches/series index 8126b655..139402b8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,7 +41,6 @@ ppd-poll-with-client-conf.patch removecvstag.patch # Debian patches -revert-upstream-change-to-FINAL_CONTENT_TYPE-to-fix-printing-to-remote-CUPS-servers.patch do-not-broadcast-with-hostnames.patch reactivate_recommended_driver.patch add-ipp-backend-of-cups-1.4.patch |