Stable update for system-tools-backends
Hi,
please find attached a proposed stable update for system-tools-backends.
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)
Cheers,
--
.''`. Josselin Mouette
: :' :
`. `'
`-
diff -Nru system-tools-backends-2.10.1/debian/changelog system-tools-backends-2.10.1/debian/changelog
--- system-tools-backends-2.10.1/debian/changelog 2010-12-17 22:48:52.000000000 +0100
+++ system-tools-backends-2.10.1/debian/changelog 2011-08-19 12:04:54.000000000 +0200
@@ -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@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
diff -Nru system-tools-backends-2.10.1/debian/system-tools-backends.postinst system-tools-backends-2.10.1/debian/system-tools-backends.postinst
--- system-tools-backends-2.10.1/debian/system-tools-backends.postinst 1970-01-01 01:00:00.000000000 +0100
+++ system-tools-backends-2.10.1/debian/system-tools-backends.postinst 2011-08-19 12:04:54.000000000 +0200
@@ -0,0 +1,7 @@
+#!/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 -- "$@"
+
+#DEBHELPER#
diff -Nru system-tools-backends-2.10.1/debian/system-tools-backends.postrm system-tools-backends-2.10.1/debian/system-tools-backends.postrm
--- system-tools-backends-2.10.1/debian/system-tools-backends.postrm 2007-05-06 09:43:52.000000000 +0200
+++ system-tools-backends-2.10.1/debian/system-tools-backends.postrm 2011-08-19 12:04:54.000000000 +0200
@@ -2,6 +2,9 @@
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
if [ -x /etc/init.d/dbus ]; then
diff -Nru system-tools-backends-2.10.1/debian/system-tools-backends.preinst system-tools-backends-2.10.1/debian/system-tools-backends.preinst
--- system-tools-backends-2.10.1/debian/system-tools-backends.preinst 2009-01-04 12:27:27.000000000 +0100
+++ system-tools-backends-2.10.1/debian/system-tools-backends.preinst 2011-08-19 12:04:54.000000000 +0200
@@ -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#
Reply to: