[Pkg-utopia-commits] r352 - packages/experimental/dbus/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2005-11-02 21:02:23 +0000 (Wed, 02 Nov 2005)
New Revision: 352

Added:
   packages/experimental/dbus/debian/dbus.preinst
Modified:
   packages/experimental/dbus/debian/changelog
   packages/experimental/dbus/debian/rules
Log:
Move the /etc/X11/Xsession.d/ script from dbus-1-utils to dbus

Modified: packages/experimental/dbus/debian/changelog
===================================================================
--- packages/experimental/dbus/debian/changelog	2005-11-02 20:48:10 UTC (rev 351)
+++ packages/experimental/dbus/debian/changelog	2005-11-02 21:02:23 UTC (rev 352)
@@ -3,6 +3,7 @@
   * maintainance is actually spelled "maintenance" (Closes: #332238)
   * Disable --enable-verbose because of the big performance hit
   * Move dbus-launch and dbus-send into the dbus package
+  * Move the /etc/X11/Xsession.d/ script from dbus-1-utils to dbus
   * Move dbus-binding-tool from dbus-1-utils to libdbus-glib-1-dev
   * Add reload function to the init script
   * Use log_daemon_msg instead of log_begin_msg in the init script where
@@ -11,7 +12,7 @@
     + Added. Send a reply message when org.freedesktop.DBus.ReloadConfig is
       called
 
- -- Sjoerd Simons <sjoerd at debian.org>  Wed,  2 Nov 2005 21:46:29 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed,  2 Nov 2005 21:52:11 +0100
 
 dbus (0.50-1) experimental; urgency=low
 

Added: packages/experimental/dbus/debian/dbus.preinst
===================================================================
--- packages/experimental/dbus/debian/dbus.preinst	2005-11-02 20:48:10 UTC (rev 351)
+++ packages/experimental/dbus/debian/dbus.preinst	2005-11-02 21:02:23 UTC (rev 352)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+rm_conffile() {
+  CONFFILE="$1"
+  if [ -e "$CONFFILE" ]; then
+   md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+   old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+   if [ "$md5sum" != "$old_md5sum" ]; then
+     echo "Obsolete conffile $CONFFILE has been modified by you."
+     echo "Saving as $CONFFILE.dpkg-bak ..."
+     mv -f "$CONFFILE" "$CONFFILE".bak
+   else
+     echo "Removing obsolete conffile $CONFFILE ..."
+     rm -f "$CONFFILE"
+   fi
+ fi
+}
+
+case "$1" in 
+  if dpkg --compare-versions "$2" le "0.50-1"; then
+        rm_conffile "/etc/X11/Xsession.d/75dbus-1-utils_dbus-launch"
+  fi
+esac
+
+#DEBHELPER#

Modified: packages/experimental/dbus/debian/rules
===================================================================
--- packages/experimental/dbus/debian/rules	2005-11-02 20:48:10 UTC (rev 351)
+++ packages/experimental/dbus/debian/rules	2005-11-02 21:02:23 UTC (rev 352)
@@ -55,12 +55,10 @@
 	rm -f debian/libdbus-1-dev/usr/include/dbus*/dbus/dbus-glib.h
 	rm -f debian/libdbus-1-dev/usr/include/dbus*/dbus/dbus-qt.h
 
-binary-post-install/dbus-1-utils::
-	mkdir -p debian/dbus-1-utils/etc/X11/Xsession.d
-	cp debian/dbus-Xsession debian/dbus-1-utils/etc/X11/Xsession.d/75dbus-1-utils_dbus-launch
-
 binary-post-install/dbus::
 	mkdir -p debian/dbus/etc/dbus-1/event.d
+	mkdir -p debian/dbus-1-utils/etc/X11/Xsession.d
+	cp debian/dbus-Xsession debian/dbus-1-utils/etc/X11/Xsession.d/75dbus_dbus-launch
 
 binary-post-install/libdbus-1-cil::
 	cd $(CURDIR)/debian/libdbus-1-cil && \