rev 19566 - kde-extras/icecream/trunk/debian

[Pino Toscano]

Author: pino
Date: 2013-05-24 15:18:44 +0000 (Fri, 24 May 2013)
New Revision: 19566

Added:
   kde-extras/icecream/trunk/debian/icecc.lintian-overrides
Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/icecc.postinst
Log:
manually handle the icecc-scheduler registration


Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2013-05-24 15:12:22 UTC (rev 19565)
+++ kde-extras/icecream/trunk/debian/changelog	2013-05-24 15:18:44 UTC (rev 19566)
@@ -41,8 +41,9 @@
       /etc/defaults/icecc (which has been removed now, although still used if
       present) (Closes: #656089)
     - stop using $START_ICECC and $START_ICECC_SCHEDULER in init scripts
-    - skip debhelper init scripts for icecc-scheduler, manually handling stop
-      and removal; this is done to avoid registration in the init system
+    - skip debhelper init scripts for icecc-scheduler, manually handling
+      registration (which disables icecc-scheduler only when upgrading from
+      < 1.0.0 or when installing), stop and removal
     - add NEWS and README.Debian to document how startup is handled
   * icecc.postrm: do not manually remove the conffiles in /etc, since dpkg does
     that already.

Added: kde-extras/icecream/trunk/debian/icecc.lintian-overrides
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.lintian-overrides	                        (rev 0)
+++ kde-extras/icecream/trunk/debian/icecc.lintian-overrides	2013-05-24 15:18:44 UTC (rev 19566)
@@ -0,0 +1,2 @@
+# updaterc.d can be called a second time to disable it
+icecc: duplicate-updaterc.d-calls-in-postinst icecc-scheduler

Modified: kde-extras/icecream/trunk/debian/icecc.postinst
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.postinst	2013-05-24 15:12:22 UTC (rev 19565)
+++ kde-extras/icecream/trunk/debian/icecc.postinst	2013-05-24 15:18:44 UTC (rev 19566)
@@ -24,6 +24,15 @@
 
 chown $ICECC_USER:$ICECC_GROUP $ICECC_HOME
 
+if [ -x "/etc/init.d/icecc-scheduler" ]; then
+        update-rc.d icecc-scheduler defaults >/dev/null
+        # disable icecc-scheduler either when upgrading from < 1.0.0, or when
+        # doing a new installation
+        if test -z "$2" || dpkg --compare-versions "$2" lt "1.0.0-1~"; then
+                update-rc.d icecc-scheduler disable || exit $?
+        fi
+fi
+
 if [ "$1" = "upgrade" ]; then
         if dpkg --compare-versions "$2" le "1.0.0-1~"; then
                 # unregister the old init script