[Pkg-cups-devel] r437 - in cupsys/branches/cups-1.2-ubuntu/debian:
. patches
Martin Pitt
mpitt at alioth.debian.org
Thu Feb 22 17:03:37 CET 2007
Author: mpitt
Date: Thu Feb 22 17:03:36 2007
New Revision: 437
Added:
cupsys/branches/cups-1.2-ubuntu/debian/patches/70_reactivate_recommended_driver.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/80_brother_no_backchannel.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/90_testpage-on-large-paper-sizes.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/92_texttops-prettyprint-crash.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/94_doc-port-in-client-conf.dpatch
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
Log:
* 70_reactivate_recommended_driver.dpatch: Upstream CUPS filters the
"(recommended)" marking from the NickNames of the PPD files when listing
PPDs. These are an important orientation for the user and they are also
made use of by some printer setup tools. We need them at least until a
better solution for recommending drivers gets available.
* 80_brother_no_backchannel.dpatch: Brother printers are not accessible
any more when they have printed one job through the CUPS "usb" backend.
The problem is solved by letting the backend not querying the backchannel
on these printers any more (closes: LP#57050, upstream STR #2243).
* 90_testpage-on-large-paper-sizes.dpatch: The labels at the rulers on the
borders of the CUPS test page got too big on large paper sizes (closes:
LP#85339, upstream STR #2252).
* 92_texttops-prettyprint-crash.dpatch: The plain text filter of CUPS
crashed when using the prettyprint option (upstream STR #2158).
* 94_doc-port-in-client-conf.dpatch: The documentation did not tell
how to specify a port in client.conf.
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Thu Feb 22 17:03:36 2007
@@ -1,3 +1,24 @@
+cupsys (1.2.8-0ubuntu2) feisty; urgency=low
+
+ * 70_reactivate_recommended_driver.dpatch: Upstream CUPS filters the
+ "(recommended)" marking from the NickNames of the PPD files when listing
+ PPDs. These are an important orientation for the user and they are also
+ made use of by some printer setup tools. We need them at least until a
+ better solution for recommending drivers gets available.
+ * 80_brother_no_backchannel.dpatch: Brother printers are not accessible
+ any more when they have printed one job through the CUPS "usb" backend.
+ The problem is solved by letting the backend not querying the backchannel
+ on these printers any more (closes: LP#57050, upstream STR #2243).
+ * 90_testpage-on-large-paper-sizes.dpatch: The labels at the rulers on the
+ borders of the CUPS test page got too big on large paper sizes (closes:
+ LP#85339, upstream STR #2252).
+ * 92_texttops-prettyprint-crash.dpatch: The plain text filter of CUPS
+ crashed when using the prettyprint option (upstream STR #2158).
+ * 94_doc-port-in-client-conf.dpatch: The documentation did not tell
+ how to specify a port in client.conf.
+
+ -- Till Kamppeter <till.kamppeter at gmail.com> Thu, 22 Feb 2007 12:22:06 +0000
+
cupsys (1.2.8-0ubuntu1) feisty; urgency=low
* New upstream bugfix release.
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Thu Feb 22 17:03:36 2007
@@ -31,7 +31,11 @@
#66_setegid.dpatch
67_printcap.dpatch
68_edit-config.dpatch
+70_reactivate_recommended_driver.dpatch
+80_brother_no_backchannel.dpatch
+90_testpage-on-large-paper-sizes.dpatch
+92_texttops-prettyprint-crash.dpatch
+94_doc-port-in-client-conf.dpatch
ubuntu-disable-browsing.dpatch
ubuntu-external-pam-helper.dpatch
ubuntu-default-error-policy-retry-job.dpatch
-
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/70_reactivate_recommended_driver.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/70_reactivate_recommended_driver.dpatch Thu Feb 22 17:03:36 2007
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_reactivate_recommended_driver.dpatch by <till.kamppeter at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.8~/scheduler/cups-driverd.c cupsys-1.2.8/scheduler/cups-driverd.c
+--- cupsys-1.2.8~/scheduler/cups-driverd.c 2007-01-23 17:01:48.000000000 +0000
++++ cupsys-1.2.8/scheduler/cups-driverd.c 2007-02-22 10:01:26.000000000 +0000
+@@ -147,7 +147,6 @@
+ size_t size) /* I - File size */
+ {
+ ppd_info_t *ppd; /* PPD */
+- char *recommended; /* Foomatic driver string */
+
+
+ /*
+@@ -199,14 +198,6 @@
+ strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+
+ /*
+- * Strip confusing (and often wrong) "recommended" suffix added by
+- * Foomatic drivers...
+- */
+-
+- if ((recommended = strstr(ppd->record.make_and_model, " (recommended)")) != NULL)
+- *recommended = '\0';
+-
+- /*
+ * Return the new PPD pointer...
+ */
+
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/80_brother_no_backchannel.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/80_brother_no_backchannel.dpatch Thu Feb 22 17:03:36 2007
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_brother_no_backchannel.dpatch by <till.kamppeter at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.8~/backend/usb-unix.c cupsys-1.2.8/backend/usb-unix.c
+--- cupsys-1.2.8~/backend/usb-unix.c 2007-02-05 20:25:50.000000000 +0000
++++ cupsys-1.2.8/backend/usb-unix.c 2007-02-22 10:09:54.000000000 +0000
+@@ -79,12 +79,14 @@
+ do
+ {
+ /*
+- * Disable backchannel data when printing to Canon or Minolta USB
+- * printers - apparently these printers will return the IEEE-1284
+- * device ID over and over and over when they get a read request...
++ * Disable backchannel data when printing to Brother, Canon, or
++ * Minolta USB printers - apparently these printers will return
++ * the IEEE-1284 device ID over and over and over when they get
++ * a read request...
+ */
+
+- use_bc = strcasecmp(hostname, "Canon") &&
++ use_bc = strcasecmp(hostname, "Brother") &&
++ strcasecmp(hostname, "Canon") &&
+ strcasecmp(hostname, "Konica Minolta") &&
+ strcasecmp(hostname, "Minolta");
+
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/90_testpage-on-large-paper-sizes.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/90_testpage-on-large-paper-sizes.dpatch Thu Feb 22 17:03:36 2007
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_testpage-on-large-paper-sizes.dpatch by <till.kamppeter at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.8~/data/testprint.ps cupsys-1.2.8/data/testprint.ps
+--- cupsys-1.2.8~/data/testprint.ps 2006-01-14 16:54:03.000000000 +0000
++++ cupsys-1.2.8/data/testprint.ps 2007-02-22 10:28:00.000000000 +0000
+@@ -6,7 +6,7 @@
+ %%DocumentSuppliedResources: procset testprint/1.2
+ %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
+ %%Creator: Michael Sweet, Easy Software Products
+-%%CreationDate: D:20060114093000+0500
++%%CreationDate: D:20070220113000+0500
+ %%Title: Test Page
+ %%EndComments
+ %%BeginProlog
+@@ -14,7 +14,7 @@
+ %
+ % PostScript test page for the Common UNIX Printing System ("CUPS").
+ %
+-% Copyright 1993-2006 Easy Software Products
++% Copyright 1993-2007 Easy Software Products
+ %
+ % These coded instructions, statements, and computer programs are the
+ % property of Easy Software Products and are protected by Federal
+@@ -198,7 +198,8 @@
+ /CENTIMETER 72 2.54 div def
+ /MILLIMETER 72 25.4 div def
+
+- smallFont setfont % Font
++ /Times-Roman findfont % Font for ruler numbers
++ 11 scalefont setfont % 11 points
+
+ gsave % Left side inches
+ pageLeft 72 mul 0 translate % Offset left edge
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/92_texttops-prettyprint-crash.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/92_texttops-prettyprint-crash.dpatch Thu Feb 22 17:03:36 2007
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_texttops-prettyprint-crash.dpatch by <till.kamppeter at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.8~/filter/texttops.c cupsys-1.2.8/filter/texttops.c
+--- cupsys-1.2.8~/filter/texttops.c 2006-10-02 17:26:04.000000000 +0100
++++ cupsys-1.2.8/filter/texttops.c 2007-02-22 11:07:17.000000000 +0000
+@@ -3,7 +3,7 @@
+ *
+ * Text to PostScript filter for the Common UNIX Printing System (CUPS).
+ *
+- * Copyright 1993-2005 by Easy Software Products.
++ * Copyright 1993-2007 by Easy Software Products.
+ *
+ * These coded instructions, statements, and computer programs are the
+ * property of Easy Software Products and are protected by Federal
+@@ -812,7 +812,7 @@
+
+ puts("% Reencode base fonts");
+
+- for (i = 1 + PrettyPrint; i >= 0; i --)
++ for (i = PrettyPrint ? 2 : 1; i >= 0; i --)
+ for (j = 0; j < NumFonts; j ++)
+ {
+ printf("/%s findfont\n", Fonts[j][i]);
+@@ -831,7 +831,7 @@
+
+ puts("% Create composite fonts...");
+
+- for (i = 1 + PrettyPrint; i >= 0; i --)
++ for (i = PrettyPrint ? 2 : 1; i >= 0; i --)
+ {
+ puts("8 dict begin");
+ puts("/FontType 0 def/FontMatrix[1.0 0 0 1.0 0 0]def/FMapType 2 def/Encoding[");
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/94_doc-port-in-client-conf.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/94_doc-port-in-client-conf.dpatch Thu Feb 22 17:03:36 2007
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 94_doc-port-in-client-conf.dpatch by <till.kamppeter at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.8~/doc/help/ref-client-conf.html cupsys-1.2.8/doc/help/ref-client-conf.html
+--- cupsys-1.2.8~/doc/help/ref-client-conf.html 2006-04-18 21:45:30.000000000 +0100
++++ cupsys-1.2.8/doc/help/ref-client-conf.html 2007-02-22 11:08:14.000000000 +0000
+@@ -38,16 +38,16 @@
+ <PRE CLASS="command">
+ ServerName foo.bar.com
+ ServerName 11.22.33.44
++ServerName foo.bar.com:8631
+ </PRE>
+
+ <H3>Description</H3>
+
+-<P>The <CODE>ServerName</CODE> directive specifies sets the
+-remote server that is to be used for all client operations. That
+-is, it redirects all client requests to the remote server.</P>
++<P>The <CODE>ServerName</CODE> directive specifies sets the remote server that is to be used for all client operations. That is, it redirects all client requests to the remote server.</P>
+
+-<P>The default is to use the local server
+-("<VAR>localhost</VAR>") or domain socket, if so configured.</P>
++<P>The default port number is 631 but can be overridden by adding a colon followed by the desired port number to the value.</P>
++
++<P>The default is to use the local server ("<VAR>localhost</VAR>") or domain socket, if so configured.</P>
+
+ </BODY>
+ </HTML>
More information about the Pkg-cups-devel
mailing list