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

[Martin Pitt]

Author: mpitt
Date: Sun Mar 16 18:48:46 2008
New Revision: 706

Log:
* search_mime_files_in_usr_share.dpatch: Do not fatally fail if
  DataDir/mime does not exist. This both makes much more sense (since
  /etc/cups is the canonical dir which must exist, and /usr/share/cups/mime
  is optional), and also unbreaks the test suite (which does not create this
  directory by default).

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/search_mime_files_in_usr_share.dpatch

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sun Mar 16 18:48:46 2008
@@ -14,8 +14,13 @@
     oriented. Mention this in the package description.
   * debian/rules: Explicitly build with -fno-stack-protector on arm and armel,
     since the compiler produces segfaulting binaries. Works around #469517.
+  * search_mime_files_in_usr_share.dpatch: Do not fatally fail if
+    DataDir/mime does not exist. This both makes much more sense (since
+    /etc/cups is the canonical dir which must exist, and /usr/share/cups/mime
+    is optional), and also unbreaks the test suite (which does not create this
+    directory by default).
 
- -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 14:18:22 +0100
+ -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 14:24:08 +0100
 
 cupsys (1.3.6-1) unstable; urgency=low
 

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	Sun Mar 16 18:48:46 2008
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad trunk~/scheduler/conf.c trunk/scheduler/conf.c
---- trunk~/scheduler/conf.c	2008-02-16 00:26:51.000000000 +0100
-+++ trunk/scheduler/conf.c	2008-02-26 13:01:21.000000000 +0100
-@@ -341,6 +341,7 @@
+--- trunk~/scheduler/conf.c	2008-03-16 14:22:22.000000000 +0100
++++ trunk/scheduler/conf.c	2008-03-16 14:23:33.000000000 +0100
+@@ -342,6 +342,7 @@
    cups_file_t	*fp;			/* Configuration file */
    int		status;			/* Return status */
    char		temp[1024],		/* Temporary buffer */
@@ -16,7 +16,7 @@
  		*slash;			/* Directory separator */
    cups_lang_t	*language;		/* Language */
    struct passwd	*user;			/* Default user */
-@@ -1092,11 +1093,22 @@
+@@ -1073,11 +1074,21 @@
  
     /*
      * Read the MIME type and conversion database...
@@ -31,9 +31,8 @@
 +    MimeDatabase = mimeLoad(temp2, temp);
 +    if (!MimeDatabase)
 +    {
-+      cupsdLogMessage(CUPSD_LOG_EMERG,
++      cupsdLogMessage(CUPSD_LOG_ERROR,
 +                      "Unable to load MIME database from \'%s\'!", temp2);
-+      exit(errno);
 +    }
 +
 +    MimeDatabase = mimeMerge(MimeDatabase, ServerRoot, temp);