From 525e1aa0bf34acc65362bc4fa004fc3764f71568 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 10 Apr 2010 20:47:56 +0200 Subject: [PATCH 1/3] Revert changing name for autologin --- debian/changelog | 1 - etc/xdg/lubuntu/lxdm/lxdm.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e664d8..f0cd796 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,6 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low * 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. * debian/control - Wrap build-depends and depends. 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 From 8d4f158c9da3cec1510ee1777508b920c32ca749 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Thu, 29 Apr 2010 00:18:23 +0200 Subject: [PATCH 2/3] * 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/changelog | 3 ++ usr/share/lubuntu/openbox/rc.xml | 49 +++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0cd796..f1f1b67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low * 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 - Wrap build-depends and depends. 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 From 7a75a46a81b8905dd4e49388b1173f18d003b7fe Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Thu, 29 Apr 2010 00:19:50 +0200 Subject: [PATCH 3/3] Remove custom chromium preferences support, better solution in-progress. --- debian/changelog | 3 +-- etc/xdg/lubuntu/chromium-browser/Preferences | 0 usr/bin/startlubuntu | 5 ----- usr/bin/startlubuntu-netbook | 5 ----- 4 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 etc/xdg/lubuntu/chromium-browser/Preferences diff --git a/debian/changelog b/debian/changelog index f1f1b67..6f2d91b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low - * usr/bin/start* : - - Install a custom preferences file for Chromium. + * usr/bin/start* : - Ensure the menu prefix * etc/xdg/lubuntu/lxdm/lxdm.conf - Make Lubuntu the default session by using the [base] session key. 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/usr/bin/startlubuntu b/usr/bin/startlubuntu index b8473a4..cc63282 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -41,11 +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 - 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 b3c48fb..de9e922 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -41,11 +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 - 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