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

[Martin Pitt]

Author: mpitt
Date: Tue Jun 10 14:32:54 2008
New Revision: 779

Log:
* debian/cups.preinst: Run conffile transition for "install" as well, not
  just for "upgrade" (brown paperback for this thinko!), and also remove the
  old rc.d symlinks for cupsys. (Closes: #485514)

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/cups.preinst

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Tue Jun 10 14:32:54 2008
@@ -1,8 +1,11 @@
 cups (1.3.7-7) UNRELEASED; urgency=low
 
   * Provide transitional cupsys-common package, to ease apt-get dist-upgrade.
+  * debian/cups.preinst: Run conffile transition for "install" as well, not
+    just for "upgrade" (brown paperback for this thinko!), and also remove the
+    old rc.d symlinks for cupsys. (Closes: #485514)
 
- -- Martin Pitt <mpitt at debian.org>  Tue, 10 Jun 2008 16:05:55 +0200
+ -- Martin Pitt <mpitt at debian.org>  Tue, 10 Jun 2008 16:21:02 +0200
 
 cups (1.3.7-6) unstable; urgency=low
 

Modified: cupsys/trunk/debian/cups.preinst
==============================================================================
--- cupsys/trunk/debian/cups.preinst	(original)
+++ cupsys/trunk/debian/cups.preinst	Tue Jun 10 14:32:54 2008
@@ -29,10 +29,7 @@
 }
 
 case "$1" in
-    install)
-    ;;
-
-    upgrade)
+    install|upgrade)
 	if [ -e /var/lib/cups/ppd -a ! -L /var/lib/cups/ppd -a ! -e /etc/cups/ppd ]; then
 	    echo -n "Moving printer definition files..."
 	    mkdir -p /etc/cups/ppd || true
@@ -61,7 +58,8 @@
         fi
 
         # cupsys -> cups package/file rename
-	if dpkg --compare-versions "$2" le '1.3.7-6'; then
+	if dpkg --compare-versions "$2" le '1.3.7-7'; then
+            update-rc.d -f cupsys remove
             mv_conffile /etc/default/cupsys /etc/default/cups
             mv_conffile /etc/init.d/cupsys /etc/init.d/cups
             mv_conffile /etc/pam.d/cupsys /etc/pam.d/cups