diff -Nru lubuntu-default-settings-0.2~ppa2/debian/changelog lubuntu-default-settings-0.2~ppa3/debian/changelog --- lubuntu-default-settings-0.2~ppa2/debian/changelog 2009-11-26 16:52:02.000000000 +0000 +++ lubuntu-default-settings-0.2~ppa3/debian/changelog 2009-11-26 19:06:25.000000000 +0000 @@ -1,4 +1,4 @@ -lubuntu-default-settings (0.2~ppa2) karmic; urgency=low +lubuntu-default-settings (0.2~ppa3) karmic; urgency=low * Add the volume applet to the panel to have a way to configure the sound @@ -8,11 +8,9 @@ * Move lxpanel background for Lubuntu to a specific file. * Use /etc/xdg/lubuntu to store custom configuration files. * Remove config file for lxsession, all is in desktop.conf - * Move lxsession configuration in etc/xdg/lubuntu, and launch a LXDE - session to workaround the bug of muliples icons in the menu. * Depends on lubuntu-artwork (>= 0.2) to bring the new lxpanel background. - -- Julien Lavergne Thu, 26 Nov 2009 17:50:33 +0100 + -- Julien Lavergne Fri, 06 Nov 2009 18:58:46 +0100 lubuntu-default-settings (0.1) lucid; urgency=low diff -Nru /tmp/Td6mqusTSj/lubuntu-default-settings-0.2~ppa2/debian/control /tmp/OquE6M9wde/lubuntu-default-settings-0.2~ppa3/debian/control --- lubuntu-default-settings-0.2~ppa2/debian/control 2009-11-26 16:52:02.000000000 +0000 +++ lubuntu-default-settings-0.2~ppa3/debian/control 2009-11-26 19:06:25.000000000 +0000 @@ -10,6 +10,6 @@ Package: lubuntu-default-settings Architecture: all -Depends: ${misc:Depends}, lxsession (>= 0.3.9), lubuntu-artwork +Depends: ${misc:Depends}, lxsession (>= 0.3.9), lubuntu-artwork (>= 0.2) Description: default settings for Lubuntu Various system settings tailored for Lubuntu. diff -Nru /tmp/Td6mqusTSj/lubuntu-default-settings-0.2~ppa2/etc/xdg/lubuntu/lxsession/LXDE/autostart /tmp/OquE6M9wde/lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/lxsession/LXDE/autostart --- lubuntu-default-settings-0.2~ppa2/etc/xdg/lubuntu/lxsession/LXDE/autostart 2009-11-26 16:52:02.000000000 +0000 +++ lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/lxsession/LXDE/autostart 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -@lxde-settings-daemon -@xscreensaver -no-splash -@lxpanel --profile Lubuntu -@gnome-power-manager -@pcmanfm -d diff -Nru /tmp/Td6mqusTSj/lubuntu-default-settings-0.2~ppa2/etc/xdg/lubuntu/lxsession/LXDE/desktop.conf /tmp/OquE6M9wde/lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/lxsession/LXDE/desktop.conf --- lubuntu-default-settings-0.2~ppa2/etc/xdg/lubuntu/lxsession/LXDE/desktop.conf 2009-11-26 16:52:02.000000000 +0000 +++ lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/lxsession/LXDE/desktop.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -[Session] -window_manager=openbox-lubuntu - -[GTK] -sNet/ThemeName=Clearlooks -sNet/IconThemeName=nuoveXT2 -sGtk/FontName=Sans 10 -iGtk/ToolbarStyle=3 -iGtk/ButtonImages=1 -iGtk/MenuImages=1 -iGtk/CursorThemeSize=18 -iXft/Antialias=1 - -[Mouse] -AccFactor=20 -AccThreshold=10 -LeftHanded=0 - -[Keyboard] -Delay=500 -Interval=30 diff -Nru /tmp/Td6mqusTSj/lubuntu-default-settings-0.2~ppa2/etc/xdg/lxsession/Lubuntu/autostart /tmp/OquE6M9wde/lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu/autostart --- lubuntu-default-settings-0.2~ppa2/etc/xdg/lxsession/Lubuntu/autostart 1970-01-01 01:00:00.000000000 +0100 +++ lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu/autostart 2009-11-26 19:06:25.000000000 +0000 @@ -0,0 +1,5 @@ +@lxde-settings-daemon +@xscreensaver -no-splash +@lxpanel --profile Lubuntu +@gnome-power-manager +@pcmanfm -d diff -Nru /tmp/Td6mqusTSj/lubuntu-default-settings-0.2~ppa2/etc/xdg/lxsession/Lubuntu/desktop.conf /tmp/OquE6M9wde/lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu/desktop.conf --- lubuntu-default-settings-0.2~ppa2/etc/xdg/lxsession/Lubuntu/desktop.conf 1970-01-01 01:00:00.000000000 +0100 +++ lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu/desktop.conf 2009-11-26 19:06:25.000000000 +0000 @@ -0,0 +1,21 @@ +[Session] +window_manager=openbox-lubuntu + +[GTK] +sNet/ThemeName=Clearlooks +sNet/IconThemeName=nuoveXT2 +sGtk/FontName=Sans 10 +iGtk/ToolbarStyle=3 +iGtk/ButtonImages=1 +iGtk/MenuImages=1 +iGtk/CursorThemeSize=18 +iXft/Antialias=1 + +[Mouse] +AccFactor=20 +AccThreshold=10 +LeftHanded=0 + +[Keyboard] +Delay=500 +Interval=30 diff -Nru /tmp/Td6mqusTSj/lubuntu-default-settings-0.2~ppa2/usr/bin/startlubuntu /tmp/OquE6M9wde/lubuntu-default-settings-0.2~ppa3/usr/bin/startlubuntu --- lubuntu-default-settings-0.2~ppa2/usr/bin/startlubuntu 2009-11-26 16:52:02.000000000 +0000 +++ lubuntu-default-settings-0.2~ppa3/usr/bin/startlubuntu 2009-11-26 19:06:25.000000000 +0000 @@ -5,6 +5,7 @@ fi #Allow custom configuration files in /etc/xdg/lubuntu +#Patch stolen from Xubuntu if test "x$XDG_CONFIG_DIRS" = "x" then XDG_CONFIG_DIRS="/etc/xdg/lubuntu:/etc/xdg" @@ -13,6 +14,14 @@ fi export XDG_CONFIG_DIRS +if test "x$XDG_DATA_DIRS" = "x" +then + XDG_DATA_DIRS="/etc/xdg/lubuntu:/usr/local/share:/usr/share:/usr/share" + else + XDG_DATA_DIRS="/etc/xdg/lubuntu:$XDG_DATA_DIRS:/usr/share" +fi +export XDG_DATA_DIRS + # Ensure the existance of pcmanfm config file PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm" if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then @@ -34,4 +43,4 @@ export SAL_USE_VCLPLUGIN=gtk # Start the LXDE session -exec /usr/bin/lxsession -s LXDE +exec /usr/bin/lxsession -s Lubuntu