← Back to team overview

xubuntu-dev team mailing list archive

  1. xubuntu-dev team
  2. Mailing list archive
  3. Message #01360

[Branch ~xubuntu-dev/xubuntu-default-settings/trunk] Rev 347: Use maintscript support in dh_installdeb rather than writing out

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 347
committer: Colin Watson <cjwatson@xxxxxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Sun 2012-02-12 01:05:16 +0000
message:
  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.
added:
  debian/xubuntu-default-settings.maintscript
modified:
  debian/changelog
  debian/control
  debian/xubuntu-default-settings.postinst
  debian/xubuntu-default-settings.postrm
  debian/xubuntu-default-settings.preinst


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-09 21:20:27 +0000
+++ debian/changelog	2012-02-12 01:05:16 +0000
@@ -1,8 +1,15 @@
 xubuntu-default-settings (12.04.5) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * etc/xdg/xdg-xubuntu/xfce4/xfconf/…/xfce4-keyboard-shortcuts.xml: update
     default shortcuts, per 'other-p-xubuntu-default-shortcuts' spec.
 
+  [ Colin Watson ]
+  * 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.
+
  -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Thu, 09 Feb 2012 22:18:37 +0100
 
 xubuntu-default-settings (12.04.4) precise; urgency=low

=== modified file 'debian/control'
--- debian/control	2012-02-06 16:47:18 +0000
+++ debian/control	2012-02-12 01:05:16 +0000
@@ -10,6 +10,7 @@
 
 Package: xubuntu-default-settings
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, xubuntu-artwork (>= 12.04.0~), ttf-droid,
  lightdm (>= 0.9.3-0ubuntu2), x11-common (>= 1:7.6+7ubuntu2),
  lightdm-gtk-greeter (>= 1.0.0-0ubuntu2)

=== added file 'debian/xubuntu-default-settings.maintscript'
--- debian/xubuntu-default-settings.maintscript	1970-01-01 00:00:00 +0000
+++ debian/xubuntu-default-settings.maintscript	2012-02-12 01:05:16 +0000
@@ -0,0 +1,18 @@
+rm_conffile /etc/xdg/xdg-xubuntu/applications/defaults.list 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/Thunar/volmanrc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/mount.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/actions-6.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/clock-5.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/launcher-2.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/launcher-3.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/pager-3.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/panels.xml 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/places-2.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/separator-3.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/systray-4.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/tasklist-2.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-menu-1.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/exaile/settings.ini 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc 11.04.10

=== modified file 'debian/xubuntu-default-settings.postinst'
--- debian/xubuntu-default-settings.postinst	2011-11-19 19:05:13 +0000
+++ debian/xubuntu-default-settings.postinst	2012-02-12 01:05:16 +0000
@@ -2,47 +2,6 @@
 
 set -e
 
-LASTVER="11.04.10"
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/applications/defaults.list "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/Thunar/volmanrc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/mount.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/actions-6.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/clock-5.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/launcher-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/launcher-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/pager-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/panels.xml "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/places-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/separator-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/systray-4.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/tasklist-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-menu-1.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/exaile/settings.ini "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@"
-fi
-
 case "$1" in
   configure|upgrade)
     if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then

=== modified file 'debian/xubuntu-default-settings.postrm'
--- debian/xubuntu-default-settings.postrm	2011-11-19 19:05:13 +0000
+++ debian/xubuntu-default-settings.postrm	2012-02-12 01:05:16 +0000
@@ -2,47 +2,6 @@
 
 set -e
 
-LASTVER="11.04.10"
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/applications/defaults.list "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/Thunar/volmanrc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/mount.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/actions-6.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/clock-5.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/launcher-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/launcher-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/pager-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/panels.xml "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/places-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/separator-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/systray-4.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/tasklist-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-menu-1.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/exaile/settings.ini "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@"
-fi
-
 case "$1" in
   remove|purge)
     if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then

=== modified file 'debian/xubuntu-default-settings.preinst'
--- debian/xubuntu-default-settings.preinst	2011-11-19 19:05:13 +0000
+++ debian/xubuntu-default-settings.preinst	2012-02-12 01:05:16 +0000
@@ -2,47 +2,6 @@
 
 set -e
 
-LASTVER="11.04.10"
-
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/applications/defaults.list "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/Thunar/volmanrc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/mount.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/actions-6.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/clock-5.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/launcher-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/launcher-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/pager-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/panels.xml "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/places-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/separator-3.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/systray-4.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/tasklist-2.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-menu-1.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/exaile/settings.ini "$LASTVER" -- "$@"
-  dpkg-maintscript-helper rm_conffile \
-    /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@"
-fi
-
 case "$1" in
   upgrade)
     if dpkg --compare-versions "$2" eq "11.10.2"; then
  Thread Previous • Date Previous • • Thread Next