r11965 - in /desktop/unstable/system-tools-backends/debian: changelog rules system-tools-backends.postinst system-tools-backends.preinst

[xaiki at users.alioth.debian.org]

Author: xaiki
Date: Mon Jul 16 08:42:53 2007
New Revision: 11965

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11965
Log:
  the "Long Long due Release".
  * Migrated to use regular init as hinted by slomo AGES ago 
    (closes: #421722).
  * Add valid group.

Modified:
    desktop/unstable/system-tools-backends/debian/changelog
    desktop/unstable/system-tools-backends/debian/rules
    desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst
    desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst

Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=11965&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog (original)
+++ desktop/unstable/system-tools-backends/debian/changelog Mon Jul 16 08:42:53 2007
@@ -1,3 +1,12 @@
+system-tools-backends (2.2.1-5) unstable; urgency=low
+
+  the "Long Long due Release".
+  * Migrated to use regular init as hinted by slomo AGES ago 
+    (closes: #421722).
+  * Add valid group.
+  
+ -- Niv Sardi <xaiki at debian.org>  Mon, 16 Jul 2007 10:37:49 +0200
+
 system-tools-backends (2.2.1-4) unstable; urgency=low
 
   [ Niv Sardi ]

Modified: desktop/unstable/system-tools-backends/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/rules?rev=11965&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/rules (original)
+++ desktop/unstable/system-tools-backends/debian/rules Mon Jul 16 08:42:53 2007
@@ -23,8 +23,11 @@
 
 DEB_BUILDDIR := $(CURDIR)/debian/build
 
-DEB_CONFIGURE_EXTRA_FLAGS += --datadir=/usr/share/ --with-net-dbus=/usr/lib/perl5 --with-stb-group=root
+DEB_CONFIGURE_EXTRA_FLAGS += --datadir=/usr/share/ \
+		 	     --with-net-dbus=/usr/lib/perl5 \
+			     --with-stb-group=stb-admin
 
+DEB_DH_INSTALLINIT_ARGS := -- start 30 2 3 4 5 . stop 30 0 1 6 .
 
 build/system-tools-backends::
 	# generate POT file for translators

Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst?rev=11965&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst Mon Jul 16 08:42:53 2007
@@ -32,9 +32,6 @@
     if [ ! -e /var/run/system-tools-backends.pid ] || ! ps --no-headers -p $(cat /var/run/system-tools-backends.pid) > /dev/null 2>&1; then
         if [ -x /etc/init.d/dbus ]; then
             invoke-rc.d dbus force-reload || true
-            if [ ! -e /var/run/system-tools-backends.pid ] || ! ps --no-headers -p $(cat /var/run/system-tools-backends.pid) > /dev/null 2>&1; then
-                /etc/dbus-1/event.d/70system-tools-backends start || true
-            fi
         fi
     fi
   ;;
@@ -50,3 +47,6 @@
 # generated by other debhelper scripts.
 
 #DEBHELPER#
+
+
+

Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst?rev=11965&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst Mon Jul 16 08:42:53 2007
@@ -2,9 +2,12 @@
 
 # stop backend here when upgrading from a version that didn't handle
 # it correctly yet in the prerm
-if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl 2.1.0-0ubuntu2 \
-    && [ -x /etc/dbus-1/event.d/70system-tools-backends ]; then
-    /etc/dbus-1/event.d/70system-tools-backends stop || true
-fi
+case "$1" in
+    install|upgrade)
+	if dpkg --compare-versions "$2" lt 2.2.1-5; then
+	    test -x /etc/dbus-1/event.d/70system-tools-backends && \
+		/etc/dbus-1/event.d/70system-tools-backends stop
+	    rm_conffile "/etc/dbus-1/event.d/70system-tools-backends"
+	fi
 
 #DEBHELPER#