=== modified file 'debian/changelog' --- debian/changelog 2012-01-25 23:48:25 +0000 +++ debian/changelog 2012-02-14 17:32:17 +0000 @@ -1,3 +1,12 @@ +lubuntu-default-settings (0.24) 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. + + -- Colin Watson Tue, 14 Feb 2012 17:32:08 +0000 + lubuntu-default-settings (0.23) precise; urgency=low * usr/share/lubuntu/openbox/menu.xml & rc.xml === modified file 'debian/control' --- debian/control 2011-11-08 18:30:25 +0000 +++ debian/control 2012-02-14 17:32:07 +0000 @@ -2,7 +2,7 @@ Source: lubuntu-default-settings Section: x11 Priority: optional Maintainer: Julien Lavergne -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 8.1.0~), intltool Standards-Version: 3.8.3 Homepage: https://launchpad.net/~lubuntu-desktop @@ -11,6 +11,7 @@ Vcs-Browser: http://bazaar.launchpad.net Package: lubuntu-default-settings Architecture: all +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), === added file 'debian/maintscript' --- debian/maintscript 1970-01-01 00:00:00 +0000 +++ debian/maintscript 2012-02-14 17:31:28 +0000 @@ -0,0 +1 @@ +mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 === modified file 'debian/postinst' --- debian/postinst 2011-11-07 10:23:34 +0000 +++ debian/postinst 2012-02-14 17:31:39 +0000 @@ -10,10 +10,6 @@ if [ -f /etc/alternatives/lxdm.conf ] ; fi fi -if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then - dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" -fi - if [ "$1" = "configure" ] ; then update-alternatives --install /etc/lxdm/default.conf \ lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60 === modified file 'debian/postrm' --- debian/postrm 2011-08-15 23:22:01 +0000 +++ debian/postrm 2012-02-14 17:31:43 +0000 @@ -2,10 +2,6 @@ set -e -if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then - dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" -fi - case "$1" in remove|purge) if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then === removed file 'debian/preinst' --- debian/preinst 2010-12-05 23:15:18 +0000 +++ debian/preinst 1970-01-01 00:00:00 +0000 @@ -1,10 +0,0 @@ -#!/bin/sh -e - -set -e - -if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then - dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" -fi - -#DEBHELPER# -exit 0