[Pkg-cups-devel] r174 - cupsys/branches/cups-1.2-ubuntu/debian

[Martin Pitt]

Author: mpitt
Date: Thu Apr 13 08:50:19 2006
New Revision: 174

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst
Log:
* debian/cupsys.preinst:
  - Migrate /etc/cups/cupsd-browsing.conf to /etc/cups/cups.d/browse.conf
    for smooth upgrades from Hoary.
  - Fix owner of /etc/cups/ppd/* on upgrades.



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	Thu Apr 13 08:50:19 2006
@@ -18,8 +18,12 @@
     ports in the default install' policy.
   * debian/README.Debian: Explain disabling of administrative functions in web
     interface and describe how to re-enable it.
+  * debian/cupsys.preinst: 
+    - Migrate /etc/cups/cupsd-browsing.conf to /etc/cups/cups.d/browse.conf
+      for smooth upgrades from Hoary.
+    - Fix owner of /etc/cups/ppd/* on upgrades.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Wed, 12 Apr 2006 19:48:54 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 13 Apr 2006 10:48:37 +0200
 
 cupsys (1.1.99.rc2-1) UNRELEASED-experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst	Thu Apr 13 08:50:19 2006
@@ -51,6 +51,20 @@
 
 	# Remove obsolete /etc/cups/certs
 	[ -L /etc/cups/certs ] && rm -f /etc/cups/certs || true
+
+	# Move cupsd-browsing.conf to new location and name
+	if dpkg --compare-versions "$2" le-nl '1.1.23-10ubuntu4'; then
+	    if [ -f /etc/cups/cupsd-browsing.conf ]; then
+		echo "Moving /etc/cups/cupsd-browsing.conf to new location /etc/cups/cups.d/browse.conf..."
+		mkdir -p /etc/cups/cups.d
+		mv /etc/cups/cupsd-browsing.conf /etc/cups/cups.d/browse.conf
+	    fi
+	fi
+
+	# Fix root-owned PPD files from upgrades
+	if dpkg --compare-versions "$2" le-nl '1.1.99.b1.r4929-0ubuntu2'; then
+	    find /etc/cups/ppd -type f -uid 0 -exec chown cupsys '{}' \; || true
+	fi
     ;;
 
     abort-upgrade)