[Pkg-xfce-commits] r6417 - desktop/trunk/xfce4-panel/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-02-16 21:25:35 +0000 (Thu, 16 Feb 2012)
New Revision: 6417

Added:
   desktop/trunk/xfce4-panel/debian/xfce4-panel.maintscript
Removed:
   desktop/trunk/xfce4-panel/debian/xfce4-panel.postrm
   desktop/trunk/xfce4-panel/debian/xfce4-panel.preinst
Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst
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: #659887

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2012-02-16 20:08:43 UTC (rev 6416)
+++ desktop/trunk/xfce4-panel/debian/changelog	2012-02-16 21:25:35 UTC (rev 6417)
@@ -1,3 +1,13 @@
+xfce4-panel (4.8.6-3) 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: #659887
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 16 Feb 2012 21:38:03 +0100
+
 xfce4-panel (4.8.6-2) unstable; urgency=low
 
   * debian/patches:

Added: desktop/trunk/xfce4-panel/debian/xfce4-panel.maintscript
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.maintscript	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.maintscript	2012-02-16 21:25:35 UTC (rev 6417)
@@ -0,0 +1,7 @@
+rm_conffile /etc/xdg/xfce4/panel/clock-14.rc 4.7.0
+rm_conffile /etc/xdg/xfce4/panel/launcher-10.rc 4.7.0
+rm_conffile /etc/xdg/xfce4/panel/launcher-7.rc 4.7.0
+rm_conffile /etc/xdg/xfce4/panel/launcher-9.rc 4.7.0
+rm_conffile /etc/xdg/xfce4/panel/panels.xml 4.7.0
+rm_conffile /etc/xdg/xfce4/panel/systray-4.rc 4.7.0
+rm_conffile /etc/xdg/xfce4/panel/xfce4-menu-5.rc 4.7.0

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst	2012-02-16 20:08:43 UTC (rev 6416)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.postinst	2012-02-16 21:25:35 UTC (rev 6417)
@@ -2,25 +2,6 @@
 
 set -e
 
-LASTVER="4.7.0" 
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/clock-14.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-10.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-7.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-9.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/panels.xml "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/systray-4.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/xfce4-menu-5.rc "$LASTVER" -- "$@"
-fi
-
 if [ "$1" = "configure" ]; then
 	# Run ldconfig to update shared library system
 	ldconfig

Deleted: desktop/trunk/xfce4-panel/debian/xfce4-panel.postrm
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.postrm	2012-02-16 20:08:43 UTC (rev 6416)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.postrm	2012-02-16 21:25:35 UTC (rev 6417)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LASTVER="4.7.0" 
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/clock-14.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-10.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-7.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-9.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/panels.xml "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/systray-4.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/xfce4-menu-5.rc "$LASTVER" -- "$@"
-fi
-
-#DEBHELPER#

Deleted: desktop/trunk/xfce4-panel/debian/xfce4-panel.preinst
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.preinst	2012-02-16 20:08:43 UTC (rev 6416)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.preinst	2012-02-16 21:25:35 UTC (rev 6417)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LASTVER="4.7.0" 
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/clock-14.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-10.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-7.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/launcher-9.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/panels.xml "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/systray-4.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xfce4/panel/xfce4-menu-5.rc "$LASTVER" -- "$@"
-fi
-
-#DEBHELPER#