summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Leigh <rleigh@debian.org>2012-02-04 10:51:52 +0000
committerRoger Leigh <rleigh@debian.org>2012-02-04 10:51:52 +0000
commite8f21a0a9d73ddbe2207603b36866d4e4d7d794e (patch)
treef1cb11a4b8084026e1bc12c898d6bfb2db003df1
parent5a7968a91af53c22b2e01a9a3d67a1818453344d (diff)
debian: Update patchset to include genppd patch
Don't use Apple-specific paths in genppd for colour profiles.
-rw-r--r--debian/patches/0001-patch-stdio.h-is-required-by-commandtoepson-and-comm.patch4
-rw-r--r--debian/patches/0002-genppd-don-t-write-color-profile-information-with-br.patch31
-rw-r--r--debian/patches/series1
3 files changed, 34 insertions, 2 deletions
diff --git a/debian/patches/0001-patch-stdio.h-is-required-by-commandtoepson-and-comm.patch b/debian/patches/0001-patch-stdio.h-is-required-by-commandtoepson-and-comm.patch
index 806e3f8..92e92ee 100644
--- a/debian/patches/0001-patch-stdio.h-is-required-by-commandtoepson-and-comm.patch
+++ b/debian/patches/0001-patch-stdio.h-is-required-by-commandtoepson-and-comm.patch
@@ -1,7 +1,7 @@
-From 008adc3d897a4844edbaef4d045b2c9f63744f61 Mon Sep 17 00:00:00 2001
+From bf99e94f197ef5390356e42b7a83e75c1535fb32 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@debian.org>
Date: Thu, 24 Nov 2011 21:40:54 +0000
-Subject: [PATCH] patch: stdio.h is required by commandtoepson and
+Subject: [PATCH 1/2] patch: stdio.h is required by commandtoepson and
commandtocanon
---
diff --git a/debian/patches/0002-genppd-don-t-write-color-profile-information-with-br.patch b/debian/patches/0002-genppd-don-t-write-color-profile-information-with-br.patch
new file mode 100644
index 0000000..d31fbe8
--- /dev/null
+++ b/debian/patches/0002-genppd-don-t-write-color-profile-information-with-br.patch
@@ -0,0 +1,31 @@
+From 43a11702c9781c3599bafba6a7cf7541df9c4cb4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 1 Jan 2012 17:49:09 +0100
+Subject: [PATCH 2/2] genppd: don't write color profile information with
+ broken macos-specific paths
+
+Closes: #625925
+---
+ src/cups/genppd.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/cups/genppd.c b/src/cups/genppd.c
+index 4e85388..6153371 100644
+--- a/src/cups/genppd.c
++++ b/src/cups/genppd.c
+@@ -1873,6 +1873,7 @@ write_ppd(
+ manufacturer, device_id, ppd_location, language, po,
+ all_langs);
+
++#if 0
+ /* Macintosh color management */
+ gzputs(fp, "*cupsICCProfile Gray../Grayscale: \"/System/Library/ColorSync/Profiles/sRGB Profile.icc\"\n");
+ gzputs(fp, "*cupsICCProfile RGB../Color: \"/System/Library/ColorSync/Profiles/sRGB Profile.icc\"\n");
+@@ -1880,6 +1881,7 @@ write_ppd(
+ gzputs(fp, "*APSupportsCustomColorMatching: true\n");
+ gzputs(fp, "*APDefaultCustomColorMatchingProfile: sRGB\n");
+ gzputs(fp, "*APCustomColorMatchingProfile: sRGB\n");
++#endif
+
+ gzputs(fp, "\n");
+
diff --git a/debian/patches/series b/debian/patches/series
index 4143919..63e7961 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-patch-stdio.h-is-required-by-commandtoepson-and-comm.patch
+0002-genppd-don-t-write-color-profile-information-with-br.patch