r29632 - in /desktop/unstable/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: Sun Sep 11 08:55:48 2011
New Revision: 29632

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29632
Log:
Properly guard dpkg-maintscript-helper calls.

Modified:
    desktop/unstable/system-tools-backends/   (props changed)
    desktop/unstable/system-tools-backends/debian/changelog
    desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst
    desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm
    desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst

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

Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=29632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/changelog [utf-8] Sun Sep 11 08:55:48 2011
@@ -1,4 +1,4 @@
-system-tools-backends (2.10.1-3) UNRELEASED; urgency=low
+system-tools-backends (2.10.1-3) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]
   * debian/patches/03_hostname.patch:
@@ -13,7 +13,10 @@
     /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
+  [ Josselin Mouette ]
+  * Properly guard dpkg-maintscript-helper calls.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 11 Sep 2011 10:55:32 +0200
 
 system-tools-backends (2.10.1-2) unstable; urgency=low
 

Modified: 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=29632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst [utf-8] Sun Sep 11 08:55:48 2011
@@ -1,7 +1,9 @@
 #!/bin/sh
 set -e
 
-dpkg-maintscript-helper mv_conffile /etc/dbus-1/system.d/system-tools-backends.conf \
+if dpkg-maintscript-helper supports mv_conffile; then
+  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 -- "$@"
+fi
 
 #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=29632&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] Sun Sep 11 08:55:48 2011
@@ -2,8 +2,10 @@
 
 set -e
 
-dpkg-maintscript-helper mv_conffile /etc/dbus-1/system.d/system-tools-backends.conf \
+if dpkg-maintscript-helper supports mv_conffile; then
+  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 -- "$@"
+fi
 
 # 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=29632&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] Sun Sep 11 08:55:48 2011
@@ -50,7 +50,9 @@
         ;;
 esac
 
-dpkg-maintscript-helper mv_conffile /etc/dbus-1/system.d/system-tools-backends.conf \
+if dpkg-maintscript-helper supports mv_conffile; then
+  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 -- "$@"
+fi
 
 #DEBHELPER#