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

[Martin Pitt]

Author: mpitt
Date: Mon Jul 24 07:33:37 2006
New Revision: 310

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst

Log:
* debian/cupsys.preinst: Drop some obsolete migration bits for
  Breezy->Dapper upgrade.

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 Jul 24 07:33:37 2006
@@ -13,10 +13,10 @@
        pages. Closes: LP#51432
      - Fixes parsing of network masks. Closes: LP#52390
      - Lots of more fixes, see upstream changelog.
+  * debian/cupsys.preinst: Drop some obsolete migration bits for
+    Breezy->Dapper upgrade.
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Fri, 21 Jul 2006 18:27:40 +0200
-
- -- Kenshi Muto <kmuto at debian.org>  Fri, 21 Jul 2006 18:43:59 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 24 Jul 2006 09:33:12 +0200
 
 cupsys (1.2.1-4) unstable; urgency=medium
 

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	Mon Jul 24 07:33:37 2006
@@ -52,20 +52,6 @@
 	# 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
-
 	# Fix global SSL certificate owner/mode breakage
 	if dpkg --compare-versions "$2" lt-nl '1.2.1-2ubuntu2'; then
 	    if [ -e /etc/ssl/certs/ssl-cert-snakeoil.pem ]; then