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

[Martin Pitt]

Author: mpitt
Date: Tue Sep  2 07:15:40 2008
New Revision: 837

Log:
search_mime_files_in_usr_share.dpatch is upstream

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/patches/00list
   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	Tue Sep  2 07:15:40 2008
@@ -1,5 +1,6 @@
 # patches taken from upstream SVN:
 manpage-typos.dpatch
+search_mime_files_in_usr_share.dpatch
 pdftops-cups-1.4.dpatch
 pdftops-dont_fail_on_cancel.dpatch
 
@@ -24,7 +25,6 @@
 classes_crash.dpatch
 reactivate_recommended_driver.dpatch
 include_krb5_h_in_job_h.dpatch
-search_mime_files_in_usr_share.dpatch
 pjl-display-ready-message.dpatch
 
 # Ubuntu patches

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	Tue Sep  2 07:15:40 2008
@@ -2,7 +2,7 @@
 ## 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
+## DP: http://www.cups.org/str.php?L2719, svn trunk r7670
 
 @DPATCH@
 diff -urNad cups-1.3.8~/scheduler/conf.c cups-1.3.8/scheduler/conf.c