From ca46e8c7346cac1f1c8177232367073753f6c5b1 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 13 Jun 2010 10:54:05 +0200 Subject: [PATCH] revert new binary change, not ready. --- debian/changelog | 2 -- usr/bin/lubuntu-common | 52 ---------------------------------- usr/bin/startlubuntu | 54 ++++++++++++++++++++++++++++++++++-- usr/bin/startlubuntu-netbook | 54 ++++++++++++++++++++++++++++++++++-- 4 files changed, 104 insertions(+), 58 deletions(-) delete mode 100644 usr/bin/lubuntu-common diff --git a/debian/changelog b/debian/changelog index e73e2a7..a0e4648 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,6 @@ lubuntu-default-settings (0.9) UNRELEASED; urgency=low * usr/bin - Add export XLIB_SKIP_ARGB_VISUALS=1 to disable rgba support, since lxpanel doesn't support it. (See #589763) - - Add a new binary lubuntu-common, which is used by all startlubuntu* - binary. (LP: #579524). - Remove check for pcmanfm conf file in home directory, pcmanfm2 handle it correctly. diff --git a/usr/bin/lubuntu-common b/usr/bin/lubuntu-common deleted file mode 100644 index e262ccf..0000000 --- a/usr/bin/lubuntu-common +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -#Workaround to disable rgba, because lxpanel doesn't support it (see bug #589763) -export XLIB_SKIP_ARGB_VISUALS=1 - -if [ -z "$XDG_CONFIG_HOME" ]; then - export XDG_CONFIG_HOME="$HOME/.config" -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" -else - XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS:/etc/xdg" -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 openbox config file -OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" -if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then - mkdir -p "$OPENBOX_CONF_DIR" - cp /usr/share/lubuntu/openbox/rc.xml "$OPENBOX_CONF_DIR/lubuntu-rc.xml" -fi - -# Install custom QT configuration if no one is already installed -if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then - cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf" -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 - -#Ensure the menu prefix -export XDG_MENU_PREFIX="lxde-" - -# Enable GTK+2 integration for OpenOffice.org, if available. -export SAL_USE_VCLPLUGIN=gtk - -# Launch DBus if needed -if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then - eval "$(dbus-launch --sh-syntax --exit-with-session)" -fi diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 97df9a3..c6ef69e 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -1,7 +1,57 @@ #!/bin/sh -# Launch common scripts and env for Lubuntu. -exec /usr/bin/lubuntu-common +#Workaround to disable rgba, because lxpanel in Lubuntu doesn't support it +#(see bug #589763) + +export XLIB_SKIP_ARGB_VISUALS=1 + +if [ -z "$XDG_CONFIG_HOME" ]; then + export XDG_CONFIG_HOME="$HOME/.config" +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" +else + XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS:/etc/xdg" +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 openbox config file +OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" +if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then + mkdir -p "$OPENBOX_CONF_DIR" + cp /usr/share/lubuntu/openbox/rc.xml "$OPENBOX_CONF_DIR/lubuntu-rc.xml" +fi + +# Install custom QT configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then + cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf" +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 + +#Ensure the menu prefix +export XDG_MENU_PREFIX="lxde-" + +# Enable GTK+2 integration for OpenOffice.org, if available. +export SAL_USE_VCLPLUGIN=gtk + +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi # Start the LXDE session exec /usr/bin/lxsession -s Lubuntu -e LXDE diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index 5a66d3e..fc99153 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -1,7 +1,57 @@ #!/bin/sh -# Launch common scripts and env for Lubuntu. -exec /usr/bin/lubuntu-common +#Workaround to disable rgba, because lxpanel in Lubuntu doesn't support it +#(see bug #589763) + +export XLIB_SKIP_ARGB_VISUALS=1 + +if [ -z "$XDG_CONFIG_HOME" ]; then + export XDG_CONFIG_HOME="$HOME/.config" +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" +else + XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS:/etc/xdg" +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 openbox config file +OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" +if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then + mkdir -p "$OPENBOX_CONF_DIR" + cp /usr/share/lubuntu/openbox/rc.xml "$OPENBOX_CONF_DIR/lubuntu-rc.xml" +fi + +# Install custom QT configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then + cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf" +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 + +#Ensure the menu prefix +export XDG_MENU_PREFIX="lxde-" + +# Enable GTK+2 integration for OpenOffice.org, if available. +export SAL_USE_VCLPLUGIN=gtk + +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi # Start the LXDE session exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE