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

[Martin Pitt]

Author: mpitt
Date: Tue Sep  2 07:28:01 2008
New Revision: 839

Log:
more patch status cleanup

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list
   cupsys/trunk/debian/patches/freebsd.dpatch
   cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Tue Sep  2 07:28:01 2008
@@ -36,8 +36,10 @@
   [ Martin Pitt ]
   * Add alternative dependency "gsfonts-x11" for ttf-freefonts. 
     (Closes: #495598)
+  * debian/patches/: Update the status of patches, add some upstream
+    references, update status in 00list.
 
- -- Martin Pitt <mpitt at debian.org>  Mon, 01 Sep 2008 21:21:52 +0200
+ -- Martin Pitt <mpitt at debian.org>  Tue, 02 Sep 2008 09:27:06 +0200
 
 cups (1.3.8-5) experimental; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Tue Sep  2 07:28:01 2008
@@ -1,31 +1,33 @@
-# patches taken from upstream SVN:
+# patches backported from upstream SVN trunk for 1.4:
+freebsd.dpatch
 manpage-typos.dpatch
 search_mime_files_in_usr_share.dpatch
 pdftops-cups-1.4.dpatch
 pdftops-dont_fail_on_cancel.dpatch
 
-# patches accepted and committed upstream
-freebsd.dpatch
+# patches accepted and committed upstream for next 1.3:
 cupsfilter-path-typo.dpatch
 pjl-display-ready-message.dpatch
 
 # patches sent upstream
+removecvstag.dpatch
 pidfile.dpatch
 ppd-poll-with-client-conf.dpatch
 # no answer yet, po4a might not be appropriate
 manpage-translations.dpatch
 
+# patches which should go upstream
+classes_crash.dpatch
+include_krb5_h_in_job_h.dpatch
+
 # Debian patches
-removecvstag.dpatch
 quiesce_ipp_logging.dpatch
 default_log_warn.dpatch
 dont_force_ssl.dpatch
 cupsaccept.dpatch
 confdirperms.dpatch
 device_uri.dpatch
-classes_crash.dpatch
 reactivate_recommended_driver.dpatch
-include_krb5_h_in_job_h.dpatch
 
 # Ubuntu patches
 ubuntu-disable-browsing.dpatch

Modified: cupsys/trunk/debian/patches/freebsd.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/freebsd.dpatch	(original)
+++ cupsys/trunk/debian/patches/freebsd.dpatch	Tue Sep  2 07:28:01 2008
@@ -2,7 +2,7 @@
 ## 04_freebsd.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?L2367
+## DP: (http://www.cups.org/str.php?L2367, svn trunk r6876)
 
 @DPATCH@
 diff -urNad cups-1.2~/backend/parallel.c cups-1.2/backend/parallel.c

Modified: cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch	(original)
+++ cupsys/trunk/debian/patches/include_krb5_h_in_job_h.dpatch	Tue Sep  2 07:28:01 2008
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_include_krb5_h_in_job_h.patch.dpatch by  <till.kamppeter at gmail.com>
+## 90_include_krb5_h_in_job_h.dpatch by  <till.kamppeter at gmail.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.