------------------------------------------------------------ revno: 295 fixes bug(s): https://launchpad.net/bugs/747137 committer: Lionel Le Folgoc <[email protected]> branch nick: xubuntu-default-settings timestamp: Fri 2011-04-01 22:17:55 +0200 message: * Move etc/xdg/xdg-xubuntu/xfce4/xfconf/…/xfce4-panel.xml to etc/xdg/xdg-xubuntu/xfce4/panel/default.xml: this is the correct place to store the default settings, and avoid any weird issue when removing a panel. lp: #747137 * Handle the move in the maintainer scripts as well. renamed: etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml => etc/xdg/xdg-xubuntu/xfce4/panel/default.xml modified: debian/changelog debian/postinst debian/postrm debian/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 2011-03-18 21:12:35 +0000 +++ debian/changelog 2011-04-01 20:17:55 +0000 @@ -1,3 +1,13 @@ +xubuntu-default-settings (11.04.17) UNRELEASED; urgency=low + + * Move etc/xdg/xdg-xubuntu/xfce4/xfconf/â¦/xfce4-panel.xml to + etc/xdg/xdg-xubuntu/xfce4/panel/default.xml: this is the correct place + to store the default settings, and avoid any weird issue when removing + a panel. lp: #747137 + * Handle the move in the maintainer scripts as well. + + -- Lionel Le Folgoc <[email protected]> Fri, 01 Apr 2011 22:07:53 +0200 + xubuntu-default-settings (11.04.16) natty; urgency=low * etc/xdg/xdg-xubuntu/xfce4/xfconf/â¦/xfce4-desktop.xml: set === modified file 'debian/postinst' --- debian/postinst 2011-03-01 07:54:26 +0000 +++ debian/postinst 2011-04-01 20:17:55 +0000 @@ -43,6 +43,13 @@ /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@" fi +# Special care for the default panel config (lp: #747137) +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile \ + /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml \ + /etc/xdg/xdg-xubuntu/xfce4/panel/default.xml 11.04.16 -- "$@" +fi + case "$1" in upgrade) if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then === modified file 'debian/postrm' --- debian/postrm 2011-03-01 07:54:26 +0000 +++ debian/postrm 2011-04-01 20:17:55 +0000 @@ -43,6 +43,13 @@ /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@" fi +# Special care for the default panel config (lp: #747137) +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile \ + /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml \ + /etc/xdg/xdg-xubuntu/xfce4/panel/default.xml 11.04.16 -- "$@" +fi + case "$1" in remove|purge) if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then === modified file 'debian/preinst' --- debian/preinst 2011-03-01 07:54:26 +0000 +++ debian/preinst 2011-04-01 20:17:55 +0000 @@ -43,4 +43,11 @@ /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc "$LASTVER" -- "$@" fi +# Special care for the default panel config (lp: #747137) +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile \ + /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml \ + /etc/xdg/xdg-xubuntu/xfce4/panel/default.xml 11.04.16 -- "$@" +fi + #DEBHELPER# === renamed file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml' => 'etc/xdg/xdg-xubuntu/xfce4/panel/default.xml'
_______________________________________________ Mailing list: https://launchpad.net/~xubuntu-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~xubuntu-dev More help : https://help.launchpad.net/ListHelp
