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

[Martin Pitt]

Author: mpitt
Date: Thu Jun 12 17:47:42 2008
New Revision: 785

Log:
* debian/patches/00list: Sort patches by upstream status.

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Thu Jun 12 17:47:42 2008
@@ -4,8 +4,9 @@
   * Add empty_option_value_crash.dpatch: Fix crash on cupsd.conf options
     without a value. (Closes: #250848)
   * Add glibc2.8_build.dpatch: Fix building with glibc 2.8.
+  * debian/patches/00list: Sort patches by upstream status.
 
- -- Martin Pitt <mpitt at debian.org>  Thu, 12 Jun 2008 19:07:57 +0200
+ -- Martin Pitt <mpitt at debian.org>  Thu, 12 Jun 2008 19:13:39 +0200
 
 cups (1.3.7-7) unstable; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Thu Jun 12 17:47:42 2008
@@ -4,24 +4,26 @@
 pdftops-cups-1.4.dpatch
 pdftops-dont_fail_on_cancel.dpatch
 
+# patches accepted and committed upstream
+freebsd.dpatch
+
 # patches sent upstream
 glibc2.8_build.dpatch
+pidfile.dpatch
+ppd-poll-with-client-conf.dpatch
 
 # Debian patches
-freebsd.dpatch
 removecvstag.dpatch
 quiesce_ipp_logging.dpatch
 default_log_warn.dpatch
 dont_force_ssl.dpatch
 cupsaccept.dpatch
 confdirperms.dpatch
-pidfile.dpatch
 device_uri.dpatch
 classes_crash.dpatch
 reactivate_recommended_driver.dpatch
 include_krb5_h_in_job_h.dpatch
 search_mime_files_in_usr_share.dpatch
-ppd-poll-with-client-conf.dpatch
 
 # Ubuntu patches
 ubuntu-disable-browsing.dpatch