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

[Pino Toscano]

Author: pino
Date: 2013-05-24 12:58:12 +0000 (Fri, 24 May 2013)
New Revision: 19561

Added:
   kde-extras/icecream/trunk/debian/icecc.prerm
Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/icecc.postrm
   kde-extras/icecream/trunk/debian/rules
Log:
manuall handle icecc-scheduler init stuff


Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2013-05-24 12:50:47 UTC (rev 19560)
+++ kde-extras/icecream/trunk/debian/changelog	2013-05-24 12:58:12 UTC (rev 19561)
@@ -41,6 +41,8 @@
       /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
   * icecc.postrm: do not manually remove the conffiles in /etc, since dpkg does
     that already.
 

Modified: kde-extras/icecream/trunk/debian/icecc.postrm
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.postrm	2013-05-24 12:50:47 UTC (rev 19560)
+++ kde-extras/icecream/trunk/debian/icecc.postrm	2013-05-24 12:58:12 UTC (rev 19561)
@@ -35,6 +35,10 @@
 		;;
 esac
 
+if [ "$1" = "purge" ] ; then
+	update-rc.d icecc-scheduler remove >/dev/null
+fi
+
 #DEBHELPER#
 
 exit 0

Added: kde-extras/icecream/trunk/debian/icecc.prerm
===================================================================
--- kde-extras/icecream/trunk/debian/icecc.prerm	                        (rev 0)
+++ kde-extras/icecream/trunk/debian/icecc.prerm	2013-05-24 12:58:12 UTC (rev 19561)
@@ -0,0 +1,12 @@
+#!/bin/sh
+# prerm script for icecc
+
+set -e
+
+#DEBHELPER#
+
+if [ -x "/etc/init.d/icecc-scheduler" ]; then
+        invoke-rc.d icecc-scheduler stop || exit $?
+fi
+
+exit 0

Modified: kde-extras/icecream/trunk/debian/rules
===================================================================
--- kde-extras/icecream/trunk/debian/rules	2013-05-24 12:50:47 UTC (rev 19560)
+++ kde-extras/icecream/trunk/debian/rules	2013-05-24 12:58:12 UTC (rev 19561)
@@ -32,7 +32,7 @@
 
 override_dh_installinit:
 	dh_installinit -picecc --name=iceccd
-	dh_installinit -picecc --name=icecc-scheduler
+	dh_installinit -picecc --name=icecc-scheduler --noscripts
 
 get-orig-source-dpatch:
 	@@dh_testdir