[Pkg-xfce-commits] r6419 - desktop/trunk/xfce4-utils/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-02-16 21:42:04 +0000 (Thu, 16 Feb 2012)
New Revision: 6419

Added:
   desktop/trunk/xfce4-utils/debian/maintscript
Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/control
   desktop/trunk/xfce4-utils/debian/postinst
   desktop/trunk/xfce4-utils/debian/postrm
   desktop/trunk/xfce4-utils/debian/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: #659892

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2012-02-16 21:35:33 UTC (rev 6418)
+++ desktop/trunk/xfce4-utils/debian/changelog	2012-02-16 21:42:04 UTC (rev 6419)
@@ -1,3 +1,13 @@
+xfce4-utils (4.8.3-2) 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: #659892
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 16 Feb 2012 22:36:47 +0100
+
 xfce4-utils (4.8.3-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control	2012-02-16 21:35:33 UTC (rev 6418)
+++ desktop/trunk/xfce4-utils/debian/control	2012-02-16 21:42:04 UTC (rev 6419)
@@ -16,6 +16,7 @@
 Package: xfce4-utils
 Section: xfce
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, xterm|x-terminal-emulator, 
  x11-xserver-utils, xinit, exo-utils, procps
 Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore |

Added: desktop/trunk/xfce4-utils/debian/maintscript
===================================================================
--- desktop/trunk/xfce4-utils/debian/maintscript	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/maintscript	2012-02-16 21:42:04 UTC (rev 6419)
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/xfconf-migration-4.6.desktop 4.8.1-1

Modified: desktop/trunk/xfce4-utils/debian/postinst
===================================================================
--- desktop/trunk/xfce4-utils/debian/postinst	2012-02-16 21:35:33 UTC (rev 6418)
+++ desktop/trunk/xfce4-utils/debian/postinst	2012-02-16 21:42:04 UTC (rev 6419)
@@ -7,11 +7,6 @@
     x-session-manager.1.gz /usr/share/man/man1/startxfce4.1.gz
 fi
 
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-  /etc/xdg/autostart/xfconf-migration-4.6.desktop "4.8.1-1" -- "$@"
-fi
-
 #DEBHELPER#
 
 exit 0

Modified: desktop/trunk/xfce4-utils/debian/postrm
===================================================================
--- desktop/trunk/xfce4-utils/debian/postrm	2012-02-16 21:35:33 UTC (rev 6418)
+++ desktop/trunk/xfce4-utils/debian/postrm	2012-02-16 21:42:04 UTC (rev 6419)
@@ -1,11 +1,6 @@
 #!/bin/sh
 set -e
 
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-  /etc/xdg/autostart/xfconf-migration-4.6.desktop "4.8.1-1" -- "$@"
-fi
-
 if [ "$1" = "purge" ]; then
 	rm -f /etc/dm/Sessions/xfce4.desktop
 fi

Modified: desktop/trunk/xfce4-utils/debian/preinst
===================================================================
--- desktop/trunk/xfce4-utils/debian/preinst	2012-02-16 21:35:33 UTC (rev 6418)
+++ desktop/trunk/xfce4-utils/debian/preinst	2012-02-16 21:42:04 UTC (rev 6419)
@@ -10,11 +10,6 @@
 
 fi
 
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-  /etc/xdg/autostart/xfconf-migration-4.6.desktop "4.8.1-1" -- "$@"
-fi
-
 # Remove symlinks for el which appeared in 4.8.2-1
 case "$1" in
 install|upgrade)