r28328 - in /desktop/unstable/system-tools-backends/debian: changelog system-tools-backends.postinst system-tools-backends.postrm system-tools-backends.preinst
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Jun 6 10:12:31 UTC 2011
Author: joss
Date: Mon Jun 6 10:12:31 2011
New Revision: 28328
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28328
Log:
Properly handle the rename of
/etc/dbus-1/system.d/system-tools-backends.conf to
org.freedesktop.SystemToolsBackends.conf. (Closes: #553672)
Added:
desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst
Modified:
desktop/unstable/system-tools-backends/debian/changelog
desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm
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=28328&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/changelog [utf-8] Mon Jun 6 10:12:31 2011
@@ -8,6 +8,10 @@
* 04_empty_ntp.patch: stolen from upstream git. Don’t create an empty
ntp.conf file. Closes: #397648.
+ [ 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)
-- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 18 Dec 2010 01:38:12 +0000
Added: 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=28328&op=file
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst (added)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst [utf-8] Mon Jun 6 10:12:31 2011
@@ -1,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#
Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm?rev=28328&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm [utf-8] Mon Jun 6 10:12:31 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/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=28328&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst [utf-8] Mon Jun 6 10:12:31 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#
More information about the pkg-gnome-commits
mailing list