rev 17378 - trunk/packages/kdebase-workspace/debian
Modestas Vainius
modax at alioth.debian.org
Sat Mar 6 11:12:33 UTC 2010
Author: modax
Date: 2010-03-06 11:12:19 +0000 (Sat, 06 Mar 2010)
New Revision: 17378
Modified:
trunk/packages/kdebase-workspace/debian/changelog
trunk/packages/kdebase-workspace/debian/kdm.postrm
trunk/packages/kdebase-workspace/debian/rules
Log:
Pass --noscripts to dh_installinit for kdm because otherwise it is not
possible to avoid kdm stopping in kdm.init (either on upgrade or remove).
Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog 2010-03-06 10:24:28 UTC (rev 17377)
+++ trunk/packages/kdebase-workspace/debian/changelog 2010-03-06 11:12:19 UTC (rev 17378)
@@ -87,6 +87,8 @@
* Unversion conflicts with kdebase-workspace-libs4+5.
* Add patch 00_fix_ftfbs_with_gpsd_2.92.diff to fix geolocation dataengine
build against gpsd 2.92.
+ * Pass --noscripts to dh_installinit for kdm because otherwise it is not
+ possible to avoid kdm stopping in kdm.init (either on upgrade or remove).
[ Christian Perrier ]
* Debconf translations:
Modified: trunk/packages/kdebase-workspace/debian/kdm.postrm
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.postrm 2010-03-06 10:24:28 UTC (rev 17377)
+++ trunk/packages/kdebase-workspace/debian/kdm.postrm 2010-03-06 11:12:19 UTC (rev 17378)
@@ -29,6 +29,10 @@
;;
esac
+if [ "$1" = "purge" ] ; then
+ update-rc.d kdm remove >/dev/null || exit $?
+fi
+
#DEBHELPER#
exit 0
Modified: trunk/packages/kdebase-workspace/debian/rules
===================================================================
--- trunk/packages/kdebase-workspace/debian/rules 2010-03-06 10:24:28 UTC (rev 17377)
+++ trunk/packages/kdebase-workspace/debian/rules 2010-03-06 11:12:19 UTC (rev 17378)
@@ -21,6 +21,10 @@
DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-bin := -- -xksysguard
DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-dev := -- -xkdebase-runtime
+# For kdm: prevent it from stopping kdm in prerm ever (--no-restart-on-upgrade
+# is not enough)
+DEB_DH_INSTALLINIT_ARGS = --noscripts
+
$(foreach p,$(filter lib%, $(DEB_ARCH_PACKAGES)),$(eval DEB_DH_SHLIBDEPS_ARGS_$(p) := -- -xkdebase-runtime))
binary-install/kdm::
More information about the pkg-kde-commits
mailing list