r29421 - in /desktop/squeeze/system-tools-backends: ./ debian/changelog debian/system-tools-backends.postinst debian/system-tools-backends.postrm debian/system-tools-backends.preinst

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Aug 19 10:04:54 2011
New Revision: 29421

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29421
Log:
Properly handle the rename of
/etc/dbus-1/system.d/system-tools-backends.conf to
org.freedesktop.SystemToolsBackends.conf.  (Closes: #553672)

Added:
    desktop/squeeze/system-tools-backends/debian/system-tools-backends.postinst
      - copied unchanged from r28328, desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst
Modified:
    desktop/squeeze/system-tools-backends/   (props changed)
    desktop/squeeze/system-tools-backends/debian/changelog
    desktop/squeeze/system-tools-backends/debian/system-tools-backends.postrm
    desktop/squeeze/system-tools-backends/debian/system-tools-backends.preinst

Propchange: desktop/squeeze/system-tools-backends/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/unstable/system-tools-backends:28328

Modified: desktop/squeeze/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/squeeze/system-tools-backends/debian/changelog?rev=29421&op=diff
==============================================================================
--- desktop/squeeze/system-tools-backends/debian/changelog [utf-8] (original)
+++ desktop/squeeze/system-tools-backends/debian/changelog [utf-8] Fri Aug 19 10:04:54 2011
@@ -1,3 +1,12 @@
+system-tools-backends (2.10.1-2squeeze1) stable; urgency=low
+
+  [ Jérémy Bobbio ]
+  * Properly handle the rename of
+    /etc/dbus-1/system.d/system-tools-backends.conf to
+    org.freedesktop.SystemToolsBackends.conf.  (Closes: #553672)
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 19 Aug 2011 12:03:39 +0200
+
 system-tools-backends (2.10.1-2) unstable; urgency=low
 
   * 03_hostname.patch: patch by Mario Izquierdo to fix hostname 

Modified: desktop/squeeze/system-tools-backends/debian/system-tools-backends.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/squeeze/system-tools-backends/debian/system-tools-backends.postrm?rev=29421&op=diff
==============================================================================
--- desktop/squeeze/system-tools-backends/debian/system-tools-backends.postrm [utf-8] (original)
+++ desktop/squeeze/system-tools-backends/debian/system-tools-backends.postrm [utf-8] Fri Aug 19 10:04:54 2011
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 set -e
+
+dpkg-maintscript-helper mv_conffile /etc/dbus-1/system.d/system-tools-backends.conf \
+    /etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf 2.6.0-6.1 -- "$@"
 
 # Do not restart dbus on upgrades, only if we remove the package.
 if [ "$1" = "remove" ] ; then 

Modified: desktop/squeeze/system-tools-backends/debian/system-tools-backends.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/squeeze/system-tools-backends/debian/system-tools-backends.preinst?rev=29421&op=diff
==============================================================================
--- desktop/squeeze/system-tools-backends/debian/system-tools-backends.preinst [utf-8] (original)
+++ desktop/squeeze/system-tools-backends/debian/system-tools-backends.preinst [utf-8] Fri Aug 19 10:04:54 2011
@@ -33,7 +33,24 @@
             rm_conffile system-tools-backends "/etc/init.d/system-tools-backends"
             update-rc.d system-tools-backends remove
         fi
+        if [ -f /etc/dbus-1/system.d/system-tools-backends.conf ] && \
+           [ -f /etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf ]; then
+            # We have both old and new conffiles, which probably means that a version
+            # between 2.6.0-6.1 and 2.10.1-2 was installed.
+            if echo "68224c4af00f723e7e08992a91ddc9f286fc4f4c  /etc/dbus-1/system.d/system-tools-backends.conf" |
+               sha1sum --check --status -; then
+                # Old conffile was not modified, let's just remove it
+                rm -f /etc/dbus-1/system.d/system-tools-backends.conf
+            else
+                # Otherwise, rename it
+                mv /etc/dbus-1/system.d/system-tools-backends.conf \
+                        /etc/dbus-1/system.d/system-tools-backends.conf.dpkg-remove
+            fi
+        fi
         ;;
 esac
 
+dpkg-maintscript-helper mv_conffile /etc/dbus-1/system.d/system-tools-backends.conf \
+    /etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf 2.6.0-6.1 -- "$@"
+
 #DEBHELPER#