[Pkg-utopia-commits] r3789 - in /packages/experimental/dbus/debian: changelog control dbus.postinst dbus.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Dec 21 01:17:25 2010
New Revision: 3789

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3789
Log:
* Remove pre-lenny upgrade code.
  - Drop old Breaks/Replaces from debian/control.
  - Drop debian/dbus.preinst and clean up debian/dbus.postinst.

Removed:
    packages/experimental/dbus/debian/dbus.preinst
Modified:
    packages/experimental/dbus/debian/changelog
    packages/experimental/dbus/debian/control
    packages/experimental/dbus/debian/dbus.postinst

Modified: packages/experimental/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/changelog?rev=3789&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Tue Dec 21 01:17:25 2010
@@ -1,6 +1,9 @@
 dbus (1.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Remove pre-lenny upgrade code.
+    - Drop old Breaks/Replaces from debian/control.
+    - Drop debian/dbus.preinst and clean up debian/dbus.postinst.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 21 Dec 2010 01:34:13 +0100
 

Modified: packages/experimental/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/control?rev=3789&op=diff
==============================================================================
--- packages/experimental/dbus/debian/control (original)
+++ packages/experimental/dbus/debian/control Tue Dec 21 01:17:25 2010
@@ -27,8 +27,6 @@
          ${misc:Depends},
          adduser,
          lsb-base (>= 3.2-14)
-Breaks: dbus-1-utils (<< 1.0.2-5)
-Replaces: dbus-1-utils (<< 1.0.2-5)
 Suggests: dbus-x11
 Description: simple interprocess messaging system
  D-Bus is a message bus, used for sending messages between applications.
@@ -54,9 +52,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          dbus
-Breaks: dbus (<< 1.1.2),
-        x11-common (<< 1:7.5+4)
-Replaces: dbus (<< 1.1.2)
+Breaks: x11-common (<< 1:7.5+4)
 Description: simple interprocess messaging system (X11 deps)
  D-Bus is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in

Modified: packages/experimental/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/dbus.postinst?rev=3789&op=diff
==============================================================================
--- packages/experimental/dbus/debian/dbus.postinst (original)
+++ packages/experimental/dbus/debian/dbus.postinst Tue Dec 21 01:17:25 2010
@@ -20,15 +20,6 @@
             chown root:"$MESSAGEUSER" "$LAUNCHER"
             chmod 4754 "$LAUNCHER"
     fi
-fi
-
-# update init script symlinks for new runlevels and priorities for upgrades
-# from older versions
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.1.20-1; then
-    echo "Reinstalling init script for new runlevels and priorities ..." >&2
-    # remove old init script symlinks; dh_installinit adds the proper
-    # update-rc.d snippet later on
-    update-rc.d -f dbus remove >/dev/null
 fi
 
 # Remove stop symlinks for runlevel 1 as killprocs already does the job for us.