[Pkg-xfce-commits] r6420 - desktop/trunk/exo/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-02-16 21:56:28 +0000 (Thu, 16 Feb 2012)
New Revision: 6420

Added:
   desktop/trunk/exo/debian/libexo-common.maintscript
Removed:
   desktop/trunk/exo/debian/libexo-common.postinst
   desktop/trunk/exo/debian/libexo-common.postrm
Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/control
   desktop/trunk/exo/debian/libexo-common.preinst
Log:
Use maintscript support in dh_installdeb rather than writing out
dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a
new enough version of dpkg rather than using 'dpkg-maintscript-helper
supports' guards, leading to more predictable behaviour on upgrades.
Thanks Colin Watson for the patch.                          Closes: #659901

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2012-02-16 21:42:04 UTC (rev 6419)
+++ desktop/trunk/exo/debian/changelog	2012-02-16 21:56:28 UTC (rev 6420)
@@ -1,3 +1,13 @@
+exo (0.6.2-4) UNRELEASED; urgency=low
+
+  * Use maintscript support in dh_installdeb rather than writing out
+    dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a
+    new enough version of dpkg rather than using 'dpkg-maintscript-helper
+    supports' guards, leading to more predictable behaviour on upgrades.
+    Thanks Colin Watson for the patch.                          Closes: #659901
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 16 Feb 2012 22:43:45 +0100
+
 exo (0.6.2-3) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2012-02-16 21:42:04 UTC (rev 6419)
+++ desktop/trunk/exo/debian/control	2012-02-16 21:56:28 UTC (rev 6420)
@@ -84,6 +84,7 @@
 Section: libs
 Architecture: all
 Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libexo-0.3-0 (<< 0.3.104-3)
 Description: libexo common files

Added: desktop/trunk/exo/debian/libexo-common.maintscript
===================================================================
--- desktop/trunk/exo/debian/libexo-common.maintscript	                        (rev 0)
+++ desktop/trunk/exo/debian/libexo-common.maintscript	2012-02-16 21:56:28 UTC (rev 6420)
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/xfce4/mount.rc 0.5.2-1

Deleted: desktop/trunk/exo/debian/libexo-common.postinst
===================================================================
--- desktop/trunk/exo/debian/libexo-common.postinst	2012-02-16 21:42:04 UTC (rev 6419)
+++ desktop/trunk/exo/debian/libexo-common.postinst	2012-02-16 21:56:28 UTC (rev 6420)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LASTVER="0.5.2-1" 
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/mount.rc "$LASTVER" -- "$@"
-fi
-
-#DEBHELPER#

Deleted: desktop/trunk/exo/debian/libexo-common.postrm
===================================================================
--- desktop/trunk/exo/debian/libexo-common.postrm	2012-02-16 21:42:04 UTC (rev 6419)
+++ desktop/trunk/exo/debian/libexo-common.postrm	2012-02-16 21:56:28 UTC (rev 6420)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LASTVER="0.5.2-1" 
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/mount.rc "$LASTVER" -- "$@"
-fi
-
-#DEBHELPER#

Modified: desktop/trunk/exo/debian/libexo-common.preinst
===================================================================
--- desktop/trunk/exo/debian/libexo-common.preinst	2012-02-16 21:42:04 UTC (rev 6419)
+++ desktop/trunk/exo/debian/libexo-common.preinst	2012-02-16 21:56:28 UTC (rev 6420)
@@ -2,13 +2,6 @@
 
 set -e
 
-LASTVER="0.5.2-1" 
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/mount.rc "$LASTVER" -- "$@"
-fi
-
 # Remove symlinks for el and sv which appeared in 0.6.1-1
 case "$1" in
 install|upgrade)