Merge lp:~mrpouit/mythbuntu/mythbuntu-default-settings into lp:~mythbuntu/mythbuntu/mythbuntu-default-settings

[Lionel Le Folgoc]

[Lionel Le Folgoc (mrpouit)]

Some initial work for Bug #327926, maybe it'll be useful (I haven't checked carefully though).

[Lionel Le Folgoc (mrpouit)]

Oops, didn't notice before, part of my fix is plain stupid (debian/postinst):
case "$1" in
configure|upgrade)
foo
;;
configure)
bar
;;
esac

on "$1" == configure, only foo is done, so this needs to be split correctly, sorry.

review: Needs Fixing

[Mario Limonciello (superm1)]

Fixed up the postinst a bit, looks good otherwise.
Thanks for helping submit it in the first place!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-16 08:48:53 +0000
+++ debian/changelog	2010-01-27 22:08:12 +0000
@@ -1,3 +1,13 @@
+mythbuntu-default-settings (0.86-0ubuntu2) UNRELEASED; urgency=low
+
+  * Rename etc/xdg/mythbuntu to etc/xdg/xdg-mythbuntu lp: #327926
+    - etc/xdg/mythbuntu => etc/xdg/xdg-mythbuntu
+    - etc/xdg/xdg-mythbuntu/xfce4/panel/xfce4-menu-1.rc,
+      usr/share/mythbuntu/session.sh: update paths
+    - debian/p{re,ost}inst: handle conffiles' moves.
+
+ -- Lionel Le Folgoc <[e-mail]>  Wed, 27 Jan 2010 22:39:14 +0100
+
 mythbuntu-default-settings (0.86-0ubuntu1) lucid; urgency=low
 
   * Change gdm default session handling: (LP: #403291)

=== modified file 'debian/postinst'
--- debian/postinst	2009-12-13 01:25:19 +0000
+++ debian/postinst	2010-01-27 22:08:12 +0000
@@ -2,6 +2,18 @@
 
 set -e
 
+# Move a conffile without triggering a dpkg question
+mv_conffile() {
+    local OLDCONFFILE="$1"
+    local NEWCONFFILE="$2"
+
+    [ -e "$OLDCONFFILE" ] || return 0
+
+    echo "Preserving user changes to $NEWCONFFILE ..."
+    mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
+    mv -f "$OLDCONFFILE" "$NEWCONFFILE"
+}
+
 case "$1" in
   configure|upgrade)
 	if dpkg --compare-versions "${2}" le-nl "0.59-0ubuntu1" && [ -f /etc/xdg/mythbuntu/autostart/Network\ Manager.desktop ];
@@ -17,6 +29,30 @@
         if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then
             /usr/lib/gdm/gdm-set-default-session --keep-old mythbuntu || true
         fi
+  configure)
+    if dpkg --compare-versions "$2" lt "0.86-0ubuntu2"; then
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml" "/etc/xdg/xdg-mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" "/etc/xdg/xdg-mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml" "/etc/xdg/xdg-mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml" "/etc/xdg/xdg-mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml" "/etc/xdg/xdg-mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml" "/etc/xdg/xdg-mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/tasklist-2.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/tasklist-2.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/separator-3.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/separator-3.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/pager-3.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/pager-3.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/actions-6.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/actions-6.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/xfce4-menu-1.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/xfce4-menu-1.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/clock-5.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/clock-5.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/systray-4.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/systray-4.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/panels.xml" "/etc/xdg/xdg-mythbuntu/xfce4/panel/panels.xml"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/launcher-2.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/launcher-2.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/launcher-3.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/launcher-3.rc"
+        mv_conffile "/etc/xdg/mythbuntu/xfce4/panel/tasklist-11907684281.rc" "/etc/xdg/xdg-mythbuntu/xfce4/panel/tasklist-11907684281.rc"
+        mv_conffile "/etc/xdg/mythbuntu/applications/defaults.list" "/etc/xdg/xdg-mythbuntu/applications/defaults.list"
+        mv_conffile "/etc/xdg/mythbuntu/menus/xfce-applications.menu" "/etc/xdg/xdg-mythbuntu/menus/xfce-applications.menu"
+        mv_conffile "/etc/xdg/mythbuntu/Thunar/volmanrc" "/etc/xdg/xdg-mythbuntu/Thunar/volmanrc"
+        mv_conffile "/etc/xdg/mythbuntu/Thunar/thunarrc" "/etc/xdg/xdg-mythbuntu/Thunar/thunarrc"
+    fi
 
     ;;
 esac

=== modified file 'debian/preinst'
--- debian/preinst	2009-09-10 14:28:25 +0000
+++ debian/preinst	2010-01-27 22:08:12 +0000
@@ -20,6 +20,21 @@
     fi
 }
 
+# Prepare to move a conffile without triggering a dpkg question
+prep_mv_conffile() {
+    local PKGNAME="$1"
+    local CONFFILE="$2"
+
+    [ -e "$CONFFILE" ] || return 0
+
+    local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
+    local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
+            sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+    if [ "$md5sum" = "$old_md5sum" ]; then
+        rm -f "$CONFFILE"
+    fi
+}
+
 case "$1" in
   install|upgrade)
     if dpkg --compare-versions "$2" le "0.73-0ubuntu1"; then
@@ -42,6 +57,29 @@
     if dpkg --compare-versions "$2" le "0.79-0ubuntu1"; then
         rm_conffile "/etc/xdg/mythbuntu/gdm/gdm.conf"
     fi
+    if dpkg --compare-versions "$2" lt "0.86-0ubuntu2"; then
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/tasklist-2.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/separator-3.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/pager-3.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/actions-6.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/xfce4-menu-1.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/clock-5.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/systray-4.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/panels.xml"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/launcher-2.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/launcher-3.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/xfce4/panel/tasklist-11907684281.rc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/applications/defaults.list"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/menus/xfce-applications.menu"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/Thunar/volmanrc"
+        prep_mv_conffile mythbuntu-default-settings "/etc/xdg/mythbuntu/Thunar/thunarrc"
+    fi
     ;;
 esac
 

=== renamed directory 'etc/xdg/mythbuntu' => 'etc/xdg/xdg-mythbuntu'
=== modified file 'etc/xdg/xdg-mythbuntu/xfce4/panel/xfce4-menu-1.rc'
--- etc/xdg/mythbuntu/xfce4/panel/xfce4-menu-1.rc	2009-04-11 16:49:29 +0000
+++ etc/xdg/xdg-mythbuntu/xfce4/panel/xfce4-menu-1.rc	2010-01-27 22:08:12 +0000
@@ -1,5 +1,5 @@
 use_default_menu=false
-menu_file=/etc/xdg/mythbuntu/menus/xfce-applications.menu
+menu_file=/etc/xdg/xdg-mythbuntu/menus/xfce-applications.menu
 icon_file=/usr/share/mythbuntu/logo.png
 show_menu_icons=true
 button_title=Applications

=== modified file 'usr/share/mythbuntu/session.sh'
--- usr/share/mythbuntu/session.sh	2009-02-14 23:59:50 +0000
+++ usr/share/mythbuntu/session.sh	2010-01-27 22:08:12 +0000
@@ -47,6 +47,6 @@
 fi
 
 #Start window manager
-export XDG_CONFIG_DIRS=/etc/xdg/mythbuntu
-export XDG_DATA_DIRS=/etc/xdg/mythbuntu
+export XDG_CONFIG_DIRS=/etc/xdg/xdg-mythbuntu
+export XDG_DATA_DIRS=/etc/xdg/xdg-mythbuntu
 exec startxfce4