xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 196
fixes bug(s): https://launchpad.net/bugs/193844
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Sat 2010-03-06 11:39:10 +0100
message:
  * etc/xdg/xdg-xubuntu/*.rc => etc/xdg/xdg-xubuntu/xfce4/*.rc,
    debian/{pre,post}inst: fixed a bug introduced in a previous upload
    (maybe 10.04.0), use correct config dir.
  * etc/xdg/xdg-xubuntu/xfce4/mount.rc: fix default permissions with
    vfat. lp: #193844
renamed:
  etc/xdg/xdg-xubuntu/helpers.rc => etc/xdg/xdg-xubuntu/xfce4/helpers.rc
  etc/xdg/xdg-xubuntu/mount.rc => etc/xdg/xdg-xubuntu/xfce4/mount.rc
modified:
  debian/changelog
  debian/postinst
  debian/preinst
  etc/xdg/xdg-xubuntu/xfce4/mount.rc


--
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	2010-03-04 20:40:05 +0000
+++ debian/changelog	2010-03-06 10:39:10 +0000
@@ -1,3 +1,13 @@
+xubuntu-default-settings (10.04.5) UNRELEASED; urgency=low
+
+  * etc/xdg/xdg-xubuntu/*.rc => etc/xdg/xdg-xubuntu/xfce4/*.rc,
+    debian/{pre,post}inst: fixed a bug introduced in a previous upload
+    (maybe 10.04.0), use correct config dir.
+  * etc/xdg/xdg-xubuntu/xfce4/mount.rc: fix default permissions with
+    vfat. lp: #193844
+
+ -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Sat, 06 Mar 2010 11:25:01 +0100
+
 xubuntu-default-settings (10.04.4) lucid; urgency=low
 
   * Add a default Xdefaults settings file. lp: #361678

=== modified file 'debian/postinst'
--- debian/postinst	2010-01-28 19:55:31 +0000
+++ debian/postinst	2010-03-06 10:39:10 +0000
@@ -31,7 +31,7 @@
         /usr/lib/gdm/gdm-set-default-session --keep-old xubuntu || true
     fi
     if dpkg --compare-versions "$2" lt-nl "10.04.1"; then
-        mv_conffile "/etc/xdg/xubuntu/helpers.rc" "/etc/xdg/xdg-xubuntu/helpers.rc"
+        mv_conffile "/etc/xdg/xubuntu/helpers.rc" "/etc/xdg/xdg-xubuntu/xfce4/helpers.rc"
         mv_conffile "/etc/xdg/xubuntu/exaile/settings.ini" "/etc/xdg/xdg-xubuntu/exaile/settings.ini"
         mv_conffile "/etc/xdg/xubuntu/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml" "/etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
         mv_conffile "/etc/xdg/xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" "/etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
@@ -52,13 +52,17 @@
         mv_conffile "/etc/xdg/xubuntu/xfce4/panel/panels.xml" "/etc/xdg/xdg-xubuntu/xfce4/panel/panels.xml"
         mv_conffile "/etc/xdg/xubuntu/xfce4/panel/xfce4-menu-1.rc" "/etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-menu-1.rc"
         mv_conffile "/etc/xdg/xubuntu/Terminal/terminalrc" "/etc/xdg/xdg-xubuntu/Terminal/terminalrc"
-        mv_conffile "/etc/xdg/xubuntu/mount.rc" "/etc/xdg/xdg-xubuntu/mount.rc"
+        mv_conffile "/etc/xdg/xubuntu/mount.rc" "/etc/xdg/xdg-xubuntu/xfce4/mount.rc"
         mv_conffile "/etc/xdg/xubuntu/applications/defaults.list" "/etc/xdg/xdg-xubuntu/applications/defaults.list"
         mv_conffile "/etc/xdg/xubuntu/menus/xfce-applications.menu" "/etc/xdg/xdg-xubuntu/menus/xfce-applications.menu"
         mv_conffile "/etc/xdg/xubuntu/Thunar/volmanrc" "/etc/xdg/xdg-xubuntu/Thunar/volmanrc"
         mv_conffile "/etc/xdg/xubuntu/Thunar/thunarrc" "/etc/xdg/xdg-xubuntu/Thunar/thunarrc"
         mv_conffile "/etc/xdg/xubuntu/Thunar/uca.xml" "/etc/xdg/xdg-xubuntu/Thunar/uca.xml"
     fi
+    if dpkg --compare-versions "$2" lt-nl "10.04.5"; then
+        mv_conffile "/etc/xdg/xdg-xubuntu/helpers.rc" "/etc/xdg/xdg-xubuntu/xfce4/helpers.rc"
+        mv_conffile "/etc/xdg/xdg-xubuntu/mount.rc" "/etc/xdg/xdg-xubuntu/xfce4/mount.rc"
+    fi
     ;;
 esac
 

=== modified file 'debian/preinst'
--- debian/preinst	2010-01-28 19:55:31 +0000
+++ debian/preinst	2010-03-06 10:39:10 +0000
@@ -94,6 +94,11 @@
         prep_mv_conffile xubuntu-default-settings "/etc/xdg/xubuntu/Thunar/thunarrc"
         prep_mv_conffile xubuntu-default-settings "/etc/xdg/xubuntu/Thunar/uca.xml"
     fi
+    if dpkg --compare-versions "$2" lt-nl "10.04.5"; then
+        prep_mv_conffile xubuntu-default-settings "/etc/xdg/xdg-xubuntu/helpers.rc"
+        prep_mv_conffile xubuntu-default-settings "/etc/xdg/xdg-xubuntu/mount.rc"
+    fi
+    ;;
 esac
 
 #DEBHELPER#

=== renamed file 'etc/xdg/xdg-xubuntu/helpers.rc' => 'etc/xdg/xdg-xubuntu/xfce4/helpers.rc'
=== renamed file 'etc/xdg/xdg-xubuntu/mount.rc' => 'etc/xdg/xdg-xubuntu/xfce4/mount.rc'
--- etc/xdg/xdg-xubuntu/mount.rc	2009-11-09 10:22:37 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/mount.rc	2010-03-06 10:39:10 +0000
@@ -2,6 +2,8 @@
 uid=<auto>
 shortname=winnt
 utf8=true
+# Make sure the device does not get 0777 permissions, (maybe) to drop with exo >= 0.5
+umask=0077
 
 [iso9660]
 uid=<auto>
@@ -16,4 +18,5 @@
 
 [ntfs-3g]
 uid=<auto>
+# Make sure the device does not get 0777 permissions, (maybe) to drop with exo >= 0.5
 umask=0077