[Pkg-cups-devel] r803 - in cupsys/trunk: . debian debian/patches

Wed Jul 23 07:29:50 UTC 2008

Author: mpitt
Date: Wed Jul 23 07:29:50 2008
New Revision: 803

Log:
* New upstream release: some 20 bug fixes, no new features (see
  http://www.cups.org/articles.php?L562 for details).
* Dropped patches, accepted upstream:
  - empty_option_value_crash.dpatch
  - CVE-2008-1722.dpatch
  - glibc2.8_build.dpatch
  - HostNameLookups_values.dpatch
* manpage-typos.dpatch: Most of this got applied to 1.3.8. The ".Sh" ->
  ".SS" fix only got applied to trunk, so backport these remaining ones.

Removed:
   cupsys/trunk/debian/patches/CVE-2008-1722.dpatch
   cupsys/trunk/debian/patches/HostNameLookups_values.dpatch
   cupsys/trunk/debian/patches/empty_option_value_crash.dpatch
   cupsys/trunk/debian/patches/glibc2.8_build.dpatch
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list
   cupsys/trunk/debian/patches/manpage-typos.dpatch

Modified: cupsys/trunk/debian/changelog
==============================================================================

--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Wed Jul 23 07:29:50 2008
@@ -1,3 +1,17 @@
+cups (1.3.8-1) UNRELEASED; urgency=low
+
+  * New upstream release: some 20 bug fixes, no new features (see
+    http://www.cups.org/articles.php?L562 for details).
+  * Dropped patches, accepted upstream:
+    - empty_option_value_crash.dpatch
+    - CVE-2008-1722.dpatch
+    - glibc2.8_build.dpatch
+    - HostNameLookups_values.dpatch
+  * manpage-typos.dpatch: Most of this got applied to 1.3.8. The ".Sh" ->
+    ".SS" fix only got applied to trunk, so backport these remaining ones.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 23 Jul 2008 08:05:24 +0200
+
 cups (1.3.7-9) unstable; urgency=low
 
   [ Martin Pitt ]

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Wed Jul 23 07:29:50 2008
@@ -1,6 +1,5 @@
 # patches taken from upstream SVN:
-empty_option_value_crash.dpatch
-CVE-2008-1722.dpatch
+manpage-typos.dpatch
 pdftops-cups-1.4.dpatch
 pdftops-dont_fail_on_cancel.dpatch
 
@@ -8,11 +7,8 @@
 freebsd.dpatch
 
 # patches sent upstream
-glibc2.8_build.dpatch
 pidfile.dpatch
 ppd-poll-with-client-conf.dpatch
-HostNameLookups_values.dpatch
-manpage-typos.dpatch
 # no answer yet, po4a might not be appropriate
 manpage-translations.dpatch
 

Modified: cupsys/trunk/debian/patches/manpage-typos.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/manpage-typos.dpatch	(original)
+++ cupsys/trunk/debian/patches/manpage-typos.dpatch	Wed Jul 23 07:29:50 2008
@@ -1,55 +1,19 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## manpage-typos.dpatch by Nicolas François <nicolas.francois at centraliens.net>
 ##
-## DP: Fix various manpage typos. (Debian #478597, STR #2862)
+## DP: Fix various manpage typos. (Debian #478597, STR #2862); Fixed in 1.4
+## DP: trunk.
 
 @DPATCH@
-diff -urNad trunk~/man/cups-config.man trunk/man/cups-config.man
---- trunk~/man/cups-config.man	2007-07-11 23:46:42.000000000 +0200
-+++ trunk/man/cups-config.man	2008-06-12 20:15:38.000000000 +0200
-@@ -73,7 +73,7 @@
- --image
- .br
- When used with \fI--libs\fR, adds the CUPS imaging library to the
--list or displayed libraries.
-+list of displayed libraries.
- .TP 5
- --ldflags
- .br
-diff -urNad trunk~/man/cups-deviced.man.in trunk/man/cups-deviced.man.in
---- trunk~/man/cups-deviced.man.in	2007-07-11 23:46:42.000000000 +0200
-+++ trunk/man/cups-deviced.man.in	2008-06-12 20:15:38.000000000 +0200
-@@ -24,7 +24,7 @@
- It is run by \fIcupsd(8)\fR in response to a
- \fICUPS-Get-Devices\fR request. The output format is an IPP
- response message. The \fIrequest-id\fR argument is the request ID
--from the original IPP request, typically 1. The \Ilimit\fR
-+from the original IPP request, typically 1. The \fIlimit\fR
- argument is the limit value from the original IPP request - 0
- means no limit. The \fIuser-id\fR argument is the
- requesting-user-name value from the original IPP request.
 diff -urNad trunk~/man/cups-driverd.man.in trunk/man/cups-driverd.man.in
---- trunk~/man/cups-driverd.man.in	2007-07-11 23:46:42.000000000 +0200
-+++ trunk/man/cups-driverd.man.in	2008-06-12 20:15:38.000000000 +0200
-@@ -33,10 +33,10 @@
- stdout as indicated by the \fIoptions\fR argument. The output
- format is an IPP response message. The \fIrequest_id\fR argument
- is the request ID from the original IPP request, typically 1. The
--\Ilimit\fR argument is the limit value from the original IPP
-+\fIlimit\fR argument is the limit value from the original IPP
- request - 0 means no limit. Finally, the \fIoptions\fR argument
- is a space-delimited list of attributes ("name=value name=value
--\...") that were passed in with the request. Currently
-+\&...") that were passed in with the request. Currently
- \fIcups-driverd\fR looks for the \fIppd-make\fR and
- \fIrequested-attributes\fR attributes and tailors the output
- accordingly.
+--- trunk~/man/cups-driverd.man.in	2008-06-16 19:41:11.000000000 +0200
++++ trunk/man/cups-driverd.man.in	2008-07-23 08:07:52.000000000 +0200
 @@ -48,7 +48,7 @@
  and may be compressed using the \fIgzip(1)\fR program. Driver
  programs must implement the command-line interface shown in the
  next section.
 -.Sh DRIVER PROGRAMS
-+.SH DRIVER PROGRAMS
++.SS DRIVER PROGRAMS
  Driver programs provide an interface to dynamically-generated PPD
  files. The following arguments are currently defined:
  .TP 5
@@ -58,7 +22,7 @@
  .br
  Writes the named PPD file to stdout.
 -.Sh LISTING FILES (drivername list)
-+.SH LISTING FILES (drivername list)
++.SS LISTING FILES (drivername list)
  When run with the single argument "list", the program must list
  the available PPD files it can generate to stdout using the
  following format:
@@ -67,25 +31,25 @@
  file. \fI1284 device id\fR is the 1284DeviceId from the PPD file,
  if any.
 -.Sh WRITING FILES (drivername cat ppdname)
-+.SH WRITING FILES (drivername cat ppdname)
++.SS WRITING FILES (drivername cat ppdname)
  When the driver program is run with the "cat ppdname" arguments,
  it must write the named PPD file to stdout, uncompressed. If the
  named PPD file does not exist, the driver program must not write
  any output to stdout and report the error to stderr instead.
 -.Sh DRIVER ERROR MESSAGES
-+.SH DRIVER ERROR MESSAGES
++.SS DRIVER ERROR MESSAGES
  Error messages can be relayed back to \fIcupsd\fR by writing them
  to stderr. The following prefixes are recognized:
  .TP 5
-diff -urNad trunk~/man/lpq.man trunk/man/lpq.man
---- trunk~/man/lpq.man	2008-01-03 00:08:19.000000000 +0100
-+++ trunk/man/lpq.man	2008-06-12 20:15:38.000000000 +0200
-@@ -33,7 +33,7 @@
- .LP
- The \fI+interval\fR option allows you to continuously report the
- jobs in the queue until the queue is empty; the list of jobs is
--show once every \fIinterval\fR seconds.
-+shown once every \fIinterval\fR seconds.
- .SH OPTIONS
- \fIlpq\fR supports the following options:
- .TP 5
+diff -urNad trunk~/man/mantohtml.c trunk/man/mantohtml.c
+--- trunk~/man/mantohtml.c	2008-07-12 00:48:49.000000000 +0200
++++ trunk/man/mantohtml.c	2008-07-23 08:08:01.000000000 +0200
+@@ -158,7 +158,7 @@
+       }
+       else if (section < 0)
+         continue;
+-      else if (!strncmp(line, ".SH ", 4) || !strncmp(line, ".Sh ", 4))
++      else if (!strncmp(line, ".SH ", 4) || !strncmp(line, ".SS ", 4))
+       {
+        /*
+         * Grab heading...

