diff -Nru xfce4-utils-4.8.3/debian/changelog xfce4-utils-4.8.3/debian/changelog --- xfce4-utils-4.8.3/debian/changelog 2012-02-05 16:57:22.000000000 +0000 +++ xfce4-utils-4.8.3/debian/changelog 2012-02-14 15:33:21.000000000 +0000 @@ -1,3 +1,12 @@ +xfce4-utils (4.8.3-1ubuntu2) precise; 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. + + -- Colin Watson Tue, 14 Feb 2012 15:33:19 +0000 + xfce4-utils (4.8.3-1ubuntu1) precise; urgency=low * debian/patches: diff -Nru xfce4-utils-4.8.3/debian/control xfce4-utils-4.8.3/debian/control --- xfce4-utils-4.8.3/debian/control 2011-10-24 20:48:14.000000000 +0000 +++ xfce4-utils-4.8.3/debian/control 2012-02-14 15:33:41.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfce4-utils Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 8.9.4), libxfce4util-dev (>= 4.8.0), @@ -16,6 +17,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 | diff -Nru xfce4-utils-4.8.3/debian/maintscript xfce4-utils-4.8.3/debian/maintscript --- xfce4-utils-4.8.3/debian/maintscript 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-utils-4.8.3/debian/maintscript 2012-02-14 15:32:48.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/xdg/autostart/xfconf-migration-4.6.desktop 4.8.1-1 diff -Nru xfce4-utils-4.8.3/debian/postinst xfce4-utils-4.8.3/debian/postinst --- xfce4-utils-4.8.3/debian/postinst 2011-04-11 13:58:39.000000000 +0000 +++ xfce4-utils-4.8.3/debian/postinst 2012-02-14 15:32:58.000000000 +0000 @@ -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 diff -Nru xfce4-utils-4.8.3/debian/postrm xfce4-utils-4.8.3/debian/postrm --- xfce4-utils-4.8.3/debian/postrm 2011-04-11 13:58:39.000000000 +0000 +++ xfce4-utils-4.8.3/debian/postrm 2012-02-14 15:33:02.000000000 +0000 @@ -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 diff -Nru xfce4-utils-4.8.3/debian/preinst xfce4-utils-4.8.3/debian/preinst --- xfce4-utils-4.8.3/debian/preinst 2011-06-18 07:06:10.000000000 +0000 +++ xfce4-utils-4.8.3/debian/preinst 2012-02-14 15:32:55.000000000 +0000 @@ -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)