[Pkg-cups-devel] r721 - in cupsys/branches/cups-1.2-ubuntu: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Mon Mar 17 16:17:50 2008
New Revision: 721

Log:
* debian/cupsys.postinst: Fix 'revert to single file' transitional code to
  also apply to newer versions in dapper-updates, remove a debugging
  statement, and fix syntax of the check.

Modified:
   cupsys/branches/cups-1.2-ubuntu/   (props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
   cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch   (contents, props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/patches/pidfile.dpatch   (contents, props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch   (contents, props changed)

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Mon Mar 17 16:17:50 2008
@@ -1,3 +1,11 @@
+cupsys (1.3.6-2ubuntu2) UNRELEASED; urgency=low
+
+  * debian/cupsys.postinst: Fix 'revert to single file' transitional code to
+    also apply to newer versions in dapper-updates, remove a debugging
+    statement, and fix syntax of the check.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 17 Mar 2008 16:54:28 +0100
+
 cupsys (1.3.6-2ubuntu1) hardy; urgency=low
 
   * Merge with Debian unstable, where I applied most of our remaining Delta;

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	Mon Mar 17 16:17:50 2008
@@ -125,7 +125,7 @@
 	fi
 
         # Revert to single file
-        if [ $(dpkg --compare-versions "$2" gt 1.1.23-12 && dpkg --compare-versions "$2" lt 1.2.1-3 && echo "yes") ]; then
+        if dpkg --compare-versions "$2" gt 1.1.23-12 && dpkg --compare-versions "$2" lt-nl 1.2.2-1; then
           if [ -f /etc/cups/cups.d/ports.conf -o -f /etc/cups/cups.d/browse.conf ]; then
             perl -e 'sub readfile { local($_) = @_; open(F, $_); while (<F>) { print; } }; while (<STDIN>) { s#^Include\s+(/etc/cups/cups.d/(?:ports.conf|browse.conf))#&readfile($1)#ei; print;}' < /etc/cups/cupsd.conf > /etc/cups/cupsd.conf.$$
             mv /etc/cups/cupsd.conf.$$ /etc/cups/cupsd.conf

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch
==============================================================================

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/pidfile.dpatch
==============================================================================

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch
==============================================================================