[Pkg-cups-devel] r188 - in cupsys/branches/cups-1.2/debian: . patches

[Martin Pitt]

Author: mpitt
Date: Wed Apr 19 11:09:51 2006
New Revision: 188

Added:
   cupsys/branches/cups-1.2/debian/patches/55_ppd_okidata_name.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
Log:
Merged r176 from Ubuntu branch:
* debian/patches/55_ppd_okidata_name.dpatch: Change "Oki" manufacturer name
  to "Okidata" to be consistent with other PPD files.



Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Apr 19 11:09:51 2006
@@ -1,3 +1,11 @@
+cupsys (1.1.99.rc2-0exp2) UNRELEASED-experimental; urgency=low
+
+  [Martin Pitt]
+  * debian/patches/55_ppd_okidata_name.dpatch: Change "Oki" manufacturer name
+    to "Okidata" to be consistent with other PPD files.
+
+ -- Kenshi Muto <kmuto at debian.org>  Wed, 19 Apr 2006 13:08:15 +0200
+
 cupsys (1.1.99.rc2-0exp1) experimental; urgency=low
 
   [ Kenshi Muto ]

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Wed Apr 19 11:09:51 2006
@@ -18,3 +18,4 @@
 44_fixconfdirperms.dpatch
 47_pid.dpatch
 #48_stdlib.dpatch
+55_ppd_okidata_name.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/55_ppd_okidata_name.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/55_ppd_okidata_name.dpatch	Wed Apr 19 11:09:51 2006
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_ppd_okidata_name.dpatch by  <doko at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- ./ppd/okidata9.ppd~	2005-12-15 17:19:46.000000000 +0100
++++ ./ppd/okidata9.ppd	2006-04-12 20:13:44.240749856 +0200
+@@ -28,7 +28,7 @@
+ *LanguageVersion: English 
+ *LanguageEncoding: ISOLatin1
+ *PCFileName:	"OKIDATA9.PPD"
+-*Manufacturer:	"Oki"
++*Manufacturer:	"Okidata"
+ *Product:	"(GNU Ghostscript)"
+ *Product:	"(ESP Ghostscript)"
+ *cupsVersion:	1.2
+--- ./ppd/okidat24.ppd~	2005-12-15 17:19:46.000000000 +0100
++++ ./ppd/okidat24.ppd	2006-04-12 20:13:32.764494512 +0200
+@@ -28,7 +28,7 @@
+ *LanguageVersion: English 
+ *LanguageEncoding: ISOLatin1
+ *PCFileName:	"OKIDAT24.PPD"
+-*Manufacturer:	"Oki"
++*Manufacturer:	"Okidata"
+ *Product:	"(GNU Ghostscript)"
+ *Product:	"(ESP Ghostscript)"
+ *cupsVersion:	1.2