diff --git a/debian/changelog b/debian/changelog index b6ec5bf..342fec4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,21 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low - * debian/control: + * usr/bin/start* : + - Ensure the menu prefix + * etc/xdg/lubuntu/lxdm/lxdm.conf + - Make Lubuntu the default session by using the [base] session key. + - Remove last_*, not provided by lxdm.conf in recent lxdm version. + * usr/share/lubuntu/openbox/rc.xml + - Add missing shortcuts for volume-up and volume-down, and launching + various applications. Thanks Kendall Weaver for the patch. + * debian/control - Depends on the re-written pcmanfm2 (>= 0.7.0) - Wrap build-depends and depends. + * usr/share/lubuntu/openbox/menu.xml: + - Use new command to launch desktop settings. * autostart: - Use new pcmanfm --desktop command to start pcmanfm with desktop management * Use pcmanfm2.desktop in lxpanel panel settings. - * usr/bin/start* : - - Install a custom preferences file for Chromium. - - Ensure the menu prefix - * openbox/menu.xml : Use new command to launch desktop settings. - * etc/xdg/lubuntu/lxdm/lxdm.conf - - Make Lubuntu the default session by using the [base] session key. - - Remove last_*, not provided by lxdm.conf in recent lxdm version. - - Put "username" in the autologin key. -- Julien Lavergne Sat, 20 Mar 2010 10:58:33 +0100 diff --git a/etc/xdg/lubuntu/chromium-browser/Preferences b/etc/xdg/lubuntu/chromium-browser/Preferences deleted file mode 100644 index e69de29..0000000 diff --git a/etc/xdg/lubuntu/lxdm/lxdm.conf b/etc/xdg/lubuntu/lxdm/lxdm.conf index 2cf5dee..729f429 100644 --- a/etc/xdg/lubuntu/lxdm/lxdm.conf +++ b/etc/xdg/lubuntu/lxdm/lxdm.conf @@ -1,5 +1,5 @@ [base] -# autologin=username +# autologin=dgod session=/usr/bin/startlubuntu # numlock=0 greeter=/usr/lib/lxdm/lxdm-greeter-gtk diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 5f43d6c..cc63282 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -41,12 +41,6 @@ if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf" fi -# Install custom chromium-browser configuration -if [ ! -f "$XDG_CONFIG_HOME/chromium/Default/Preferences" ]; then - mkdir -p "$XDG_CONFIG_HOME/chromium/Default/" - cp /etc/xdg/lubuntu/chromium-browser/Preferences "$XDG_CONFIG_HOME/chromium/Default/Preferences" -fi - # Clean up after GDM (GDM sets the number of desktops to one) xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index cce64ab..de9e922 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -41,12 +41,6 @@ if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf" fi -# Install custom chromium-browser configuration -if [ ! -f "$XDG_CONFIG_HOME/chromium/Default/Preferences" ]; then - mkdir -p "$XDG_CONFIG_HOME/chromium/Default/" - cp /etc/xdg/lubuntu/chromium-browser/Preferences "$XDG_CONFIG_HOME/chromium/Default/Preferences" -fi - # Clean up after GDM (GDM sets the number of desktops to one) xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml index e081698..c2de821 100644 --- a/usr/share/lubuntu/openbox/rc.xml +++ b/usr/share/lubuntu/openbox/rc.xml @@ -329,6 +329,48 @@ +   +      +      amixer -q sset Master 3%+ +    +   + +   +      +       amixer -q sset Master 3%- +    +   + +   +      +       amixer -q sset Master toggle +    +   + +   +      +       x-terminal-emulator +    +   + +   +      +       galculator +    +   + +   +      +       pcmanfm2 +    +   + +   +      +       x-terminal-emulator +    +   + - - - - scrot - - - 8