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

Sat Sep 6 11:52:24 UTC 2008

Author: mpitt
Date: Sat Sep  6 11:52:24 2008
New Revision: 853

Log:
patch status update

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/patches/00list
   cupsys/trunk/debian/patches/default_log_warn.dpatch
   cupsys/trunk/debian/patches/freebsd.dpatch
   cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch
   cupsys/trunk/debian/patches/pdftops-dont_fail_on_cancel.dpatch
   cupsys/trunk/debian/patches/pidfile.dpatch
   cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch
   cupsys/trunk/debian/patches/removecvstag.dpatch
   cupsys/trunk/debian/patches/search_mime_files_in_usr_share.dpatch

Modified: cupsys/trunk/debian/patches/00list
==============================================================================

--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Sat Sep  6 11:52:24 2008
@@ -19,14 +19,14 @@
 
 # patches which should go upstream
 classes_crash.dpatch
+device_uri.dpatch
+reactivate_recommended_driver.dpatch
 
 # Debian patches
 quiesce_ipp_logging.dpatch
 default_log_warn.dpatch
 cupsaccept.dpatch
 confdirperms.dpatch
-device_uri.dpatch
-reactivate_recommended_driver.dpatch
 
 # Ubuntu patches
 ubuntu-disable-browsing.dpatch

Modified: cupsys/trunk/debian/patches/default_log_warn.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/default_log_warn.dpatch	(original)
+++ cupsys/trunk/debian/patches/default_log_warn.dpatch	Sat Sep  6 11:52:24 2008
@@ -1,8 +1,7 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 13_default_log_warn.dpatch by  <mpitt at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Set default loglevel to 'warning'.
 
 @DPATCH@
 diff -urNad cups~/conf/cupsd.conf.in cups/conf/cupsd.conf.in

Modified: cupsys/trunk/debian/patches/freebsd.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/freebsd.dpatch	(original)
+++ cupsys/trunk/debian/patches/freebsd.dpatch	Sat Sep  6 11:52:24 2008
@@ -1,7 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 04_freebsd.dpatch by Kenshi Muto <kmuto at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: (http://www.cups.org/str.php?L2367, svn trunk r6876)
 
 @DPATCH@

Modified: cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch	(original)
+++ cupsys/trunk/debian/patches/pdftops-cups-1.4.dpatch	Sat Sep  6 11:52:24 2008
@@ -1,7 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## pdftops-cups-1.4.dpatch by  <till.kamppeter at gmail.com>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: 1.4 uses a small filter/pdftops.c wrapper instead of xpdf. Backport this
 ## DP: since it generally works much better than the 1.3 current one.
 ## DP: Test suite fix is http://www.cups.org/str.php?L2759

Modified: cupsys/trunk/debian/patches/pdftops-dont_fail_on_cancel.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/pdftops-dont_fail_on_cancel.dpatch	(original)
+++ cupsys/trunk/debian/patches/pdftops-dont_fail_on_cancel.dpatch	Sat Sep  6 11:52:24 2008
@@ -3,7 +3,7 @@
 ##
 ## DP: Fix behavioural change in patch from STR #2780 which broke the test
 ## DP: suite: When a job is cancelled, do not report a failure in the exit code
-## DP: of pdftops. (http://www.cups.org/str.php?L2808)
+## DP: of pdftops. (http://www.cups.org/str.php?L2808, upstream svn trunk r7479)
 
 @DPATCH@
 diff -urNad trunk~/filter/pdftops.c trunk/filter/pdftops.c

Modified: cupsys/trunk/debian/patches/pidfile.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/pidfile.dpatch	(original)
+++ cupsys/trunk/debian/patches/pidfile.dpatch	Sat Sep  6 11:52:24 2008
@@ -1,8 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 47_pid.dpatch by Kenshi Muto <kmuto at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Forwarded upstream: http://www.cups.org/str.php?L2465
+## DP: Add support for creating pid files.
+## DP: (http://www.cups.org/str.php?L2465)
 
 @DPATCH@
 diff -urNad trunk~/scheduler/conf.c trunk/scheduler/conf.c

Modified: cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch	(original)
+++ cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch	Sat Sep  6 11:52:24 2008
@@ -1,12 +1,11 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## ppd-poll-with-client-conf.dpatch by  <till.kamppeter at gmail.com>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: If an external server is used via client.conf and the DNS is
 ## DP: inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS
 ## DP: gives one of these IPs for "noname") local PPDs can get polled
 ## DP: for print queues instead of the PPDs of the external server
-## DP: (CUPS STR #2763, http://www.cups.org/str.php?L2763)
+## DP: (http://www.cups.org/str.php?L2763)
 
 @DPATCH@
 diff -urNad cups-1.3.6~/cups/util.c cups-1.3.6/cups/util.c

Modified: cupsys/trunk/debian/patches/removecvstag.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/removecvstag.dpatch	(original)
+++ cupsys/trunk/debian/patches/removecvstag.dpatch	Sat Sep  6 11:52:24 2008
@@ -1,8 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 07_removecvstag.dpatch by Kenshi Muto <kmuto at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Forwarded upstream: http://www.cups.org/str.php?L2369
+## DP: Do not write VCS tags into installed conffiles
+## DP: (http://www.cups.org/str.php?L2369)
 
 @DPATCH@
 diff -urNad cups-1.2~/conf/Makefile cups-1.2/conf/Makefile

Modified: cupsys/trunk/debian/patches/search_mime_files_in_usr_share.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/search_mime_files_in_usr_share.dpatch	(original)
+++ cupsys/trunk/debian/patches/search_mime_files_in_usr_share.dpatch	Sat Sep  6 11:52:24 2008
@@ -1,7 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## search_mime_files_in_usr_share.dpatch by  <till.kamppeter at gmail.com>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: http://www.cups.org/str.php?L2719, svn trunk r7670
 
 @DPATCH@

