Browse Source

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

git-svn-id: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-panel@6417 0c9b3bff-18ee-0310-b944-d1aa2700132f
suites/jessie
mrpouit-guest 9 years ago
parent
commit
784a3dc32d
5 changed files with 17 additions and 67 deletions
  1. +10
    -0
      debian/changelog
  2. +7
    -0
      debian/xfce4-panel.maintscript
  3. +0
    -19
      debian/xfce4-panel.postinst
  4. +0
    -24
      debian/xfce4-panel.postrm
  5. +0
    -24
      debian/xfce4-panel.preinst

+ 10
- 0
debian/changelog View File

@@ -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@gmail.com> Thu, 16 Feb 2012 21:38:03 +0100

xfce4-panel (4.8.6-2) unstable; urgency=low

* debian/patches:


+ 7
- 0
debian/xfce4-panel.maintscript View File

@@ -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

+ 0
- 19
debian/xfce4-panel.postinst View File

@@ -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


+ 0
- 24
debian/xfce4-panel.postrm View File

@@ -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#

+ 0
- 24
debian/xfce4-panel.preinst View File

@@ -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#

Loading…
Cancel
Save