diff -Nru lubuntu-default-settings-0.22~ppa1/debian/changelog lubuntu-default-settings-0.24~ppa1/debian/changelog --- lubuntu-default-settings-0.22~ppa1/debian/changelog 2011-11-07 10:29:48.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/changelog 2011-12-18 23:25:22.000000000 +0000 @@ -1,4 +1,33 @@ -lubuntu-default-settings (0.22~ppa1) oneiric; urgency=low +lubuntu-default-settings (0.24~ppa1) oneiric; urgency=low + + * usr/share/lubuntu/openbox/menu.xml & rc.xml + - Re-synchronize with upstream. + - Workaround loose of focus of lxpanel run window (LP: #889414) + - Add a rule to maximize all new windows with type normal. + - Place new windows on the monitor with the mouse, rather than the primary + monitor. + - Use scrot -u -b (focused window with border) for the screenshot of the + current window. + - Add a shortcut for the power button. + * usr/bin/startlubuntu* & usr/share/lubuntu/xscreensaver/xscreensaver: + - Add a custom configuration file for xscreensaver, with blank mode by + default (LP: #578789). + * etc/xdg/lubuntu/menus/lxgames-applications.menu : + - Add a specific menu structure for a games session. + * usr/bin/startlubuntu-lxgames : + - Add a new script to start a games session, with a specific menu structure. + * usr/share/xsessions/lxgames.desktop : + - Add a new session to start a games session. + * debian/control: + - Add new binaries, to configure default session on lightdm. + * Reorganize script in debian/ to handle the creation of the new + default-session binaries. + * debian/lubuntu-default-settings.install: + - Keep all files in lubuntu-default-settings. + + -- Julien Lavergne Mon, 19 Dec 2011 00:25:04 +0100 + +lubuntu-default-settings (0.22) precise; urgency=low * Add a theme for lightdm (taking from Xubuntu, thanks Lionel Le Folgoc). * Add etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf @@ -7,8 +36,13 @@ * debian/control: - add depends on lightdm-gtk-greeter >= 1.0.0-0ubuntu2. - provides lightdm-gtk-greeter-config. + - Bump build-depends of debhelper for overrides support. + * debian/source/format: + - Switch to format 3.0 (native). + * debian/rules: + - Switch to dh syntax. - -- Julien Lavergne Mon, 07 Nov 2011 11:29:42 +0100 + -- Julien Lavergne Tue, 08 Nov 2011 20:00:37 +0100 lubuntu-default-settings (0.21) oneiric; urgency=low diff -Nru lubuntu-default-settings-0.22~ppa1/debian/control lubuntu-default-settings-0.24~ppa1/debian/control --- lubuntu-default-settings-0.22~ppa1/debian/control 2011-11-07 10:22:12.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/control 2011-12-18 23:13:17.000000000 +0000 @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Julien Lavergne -Build-Depends: debhelper (>= 7), +Build-Depends: debhelper (>= 7.0.50~), intltool Standards-Version: 3.8.3 Homepage: https://launchpad.net/~lubuntu-desktop @@ -24,3 +24,17 @@ Provides: lightdm-gtk-greeter-config Description: default settings for Lubuntu Various system settings tailored for Lubuntu. + +Package: lxgames-default-session +Architecture: all +Depends: ${misc:Depends}, + lubuntu-default-settings +Description: Set default session to lxgames + Set default session to lxgames. + +Package: lubuntu-default-session +Architecture: all +Depends: ${misc:Depends}, + lubuntu-default-settings +Description: Set default session to lxgames + Set default session to lxgames. diff -Nru lubuntu-default-settings-0.22~ppa1/debian/dirs lubuntu-default-settings-0.24~ppa1/debian/dirs --- lubuntu-default-settings-0.22~ppa1/debian/dirs 2011-11-07 10:12:49.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/etc/lxdm diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-session.postinst lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-session.postinst --- lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-session.postinst 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-session.postinst 2011-12-18 23:17:41.000000000 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh -e + +set -e + +case "$1" in + configure|upgrade) + if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then + /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=Lubuntu || true + /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true + fi + ;; +esac + +#DEBHELPER# +exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-session.postrm lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-session.postrm --- lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-session.postrm 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-session.postrm 2011-12-18 23:17:13.000000000 +0000 @@ -0,0 +1,16 @@ +#!/bin/sh -e + +set -e + +case "$1" in + remove|purge) + if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then + /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true + /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true + fi + ;; +esac + + +#DEBHELPER# +exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.dirs lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.dirs --- lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.dirs 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.dirs 2011-12-18 22:38:03.000000000 +0000 @@ -0,0 +1 @@ +/etc/lxdm diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.install lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.install --- lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.install 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.install 2011-12-18 23:11:29.000000000 +0000 @@ -0,0 +1,2 @@ +etc/ +usr/ diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.postinst lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.postinst --- lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.postinst 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.postinst 2011-12-18 23:14:56.000000000 +0000 @@ -0,0 +1,26 @@ +#!/bin/sh -e + +set -e + +# Remove alternative file if it's not a symlink, workaround for broken upgrade +# See bug #625485 +if [ -f /etc/alternatives/lxdm.conf ] ; then + if [ ! -h "/etc/alternatives/lxdm.conf" ] ; then + rm -f "/etc/alternatives/lxdm.conf" + fi +fi + +if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then + dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" +fi + +if [ "$1" = "configure" ] ; then + update-alternatives --install /etc/lxdm/default.conf \ + lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60 + update-alternatives --install /etc/lightdm/lightdm-gtk-greeter.conf \ + lightdm-gtk-greeter-config-derivative \ + /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf 30 +fi + +#DEBHELPER# +exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.postrm lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.postrm --- lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.postrm 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.postrm 2011-12-18 22:38:03.000000000 +0000 @@ -0,0 +1,20 @@ +#!/bin/sh -e + +set -e + +if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then + dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" +fi + +case "$1" in + remove|purge) + if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then + /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true + /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true + fi + ;; +esac + + +#DEBHELPER# +exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.preinst lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.preinst --- lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.preinst 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.preinst 2011-12-18 22:38:03.000000000 +0000 @@ -0,0 +1,10 @@ +#!/bin/sh -e + +set -e + +if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then + dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" +fi + +#DEBHELPER# +exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.prerm lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.prerm --- lubuntu-default-settings-0.22~ppa1/debian/lubuntu-default-settings.prerm 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lubuntu-default-settings.prerm 2011-12-18 22:38:03.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/sh -e + +set -e + +if [ "$1" = "remove" ] ; then + update-alternatives --remove lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf + update-alternatives --remove lightdm-gtk-greeter-config-derivative \ + /etc/xdg/xdg-xubuntu/lightdm/lightdm-gtk-greeter.conf +fi + +#DEBHELPER# +exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lxgames-default-session.postinst lubuntu-default-settings-0.24~ppa1/debian/lxgames-default-session.postinst --- lubuntu-default-settings-0.22~ppa1/debian/lxgames-default-session.postinst 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lxgames-default-session.postinst 2011-12-18 23:17:49.000000000 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh -e + +set -e + +case "$1" in + configure|upgrade) + if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then + /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=lxgames || true + /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true + fi + ;; +esac + +#DEBHELPER# +exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/lxgames-default-session.postrm lubuntu-default-settings-0.24~ppa1/debian/lxgames-default-session.postrm --- lubuntu-default-settings-0.22~ppa1/debian/lxgames-default-session.postrm 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/lxgames-default-session.postrm 2011-12-18 23:17:23.000000000 +0000 @@ -0,0 +1,16 @@ +#!/bin/sh -e + +set -e + +case "$1" in + remove|purge) + if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then + /usr/lib/lightdm/lightdm-set-defaults --remove --session=lxgames || true + /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true + fi + ;; +esac + + +#DEBHELPER# +exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/postinst lubuntu-default-settings-0.24~ppa1/debian/postinst --- lubuntu-default-settings-0.22~ppa1/debian/postinst 2011-11-07 10:22:15.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh -e - -set -e - -# Remove alternative file if it's not a symlink, workaround for broken upgrade -# See bug #625485 -if [ -f /etc/alternatives/lxdm.conf ] ; then - if [ ! -h "/etc/alternatives/lxdm.conf" ] ; then - rm -f "/etc/alternatives/lxdm.conf" - fi -fi - -if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then - dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" -fi - -if [ "$1" = "configure" ] ; then - update-alternatives --install /etc/lxdm/default.conf \ - lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60 - update-alternatives --install /etc/lightdm/lightdm-gtk-greeter.conf \ - lightdm-gtk-greeter-config-derivative \ - /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf 30 -fi - -case "$1" in - configure|upgrade) - if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then - /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=Lubuntu || true - /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true - fi - ;; -esac - -#DEBHELPER# -exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/postrm lubuntu-default-settings-0.24~ppa1/debian/postrm --- lubuntu-default-settings-0.22~ppa1/debian/postrm 2011-11-07 10:12:49.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh -e - -set -e - -if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then - dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" -fi - -case "$1" in - remove|purge) - if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then - /usr/lib/lightdm/lightdm-set-defaults --remove --session=Lubuntu || true - /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true - fi - ;; -esac - - -#DEBHELPER# -exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/preinst lubuntu-default-settings-0.24~ppa1/debian/preinst --- lubuntu-default-settings-0.22~ppa1/debian/preinst 2011-11-07 10:12:49.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#!/bin/sh -e - -set -e - -if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then - dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 -- "$@" -fi - -#DEBHELPER# -exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/prerm lubuntu-default-settings-0.24~ppa1/debian/prerm --- lubuntu-default-settings-0.22~ppa1/debian/prerm 2011-11-07 10:20:38.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/bin/sh -e - -set -e - -if [ "$1" = "remove" ] ; then - update-alternatives --remove lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf - update-alternatives --remove lightdm-gtk-greeter-config-derivative \ - /etc/xdg/xdg-xubuntu/lightdm/lightdm-gtk-greeter.conf -fi - -#DEBHELPER# -exit 0 diff -Nru lubuntu-default-settings-0.22~ppa1/debian/rules lubuntu-default-settings-0.24~ppa1/debian/rules --- lubuntu-default-settings-0.22~ppa1/debian/rules 2011-11-07 10:12:49.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/rules 2011-12-18 22:38:03.000000000 +0000 @@ -1,36 +1,9 @@ #!/usr/bin/make -f +%: + dh $@ -build: build-stamp -build-stamp: - dh_testdir - touch build-stamp +override_dh_auto_build: + # Skip, just use dh_install. -clean: - dh_testdir - dh_testroot - rm -f build-stamp - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs +override_dh_install: $(MAKE) DESTDIR=$(CURDIR)/debian/lubuntu-default-settings - -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff -Nru lubuntu-default-settings-0.22~ppa1/debian/source/format lubuntu-default-settings-0.24~ppa1/debian/source/format --- lubuntu-default-settings-0.22~ppa1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/debian/source/format 2011-12-18 23:36:34.000000000 +0000 @@ -0,0 +1 @@ +3.0 (native) diff -Nru lubuntu-default-settings-0.22~ppa1/etc/xdg/lubuntu/menus/lxgames-applications.menu lubuntu-default-settings-0.24~ppa1/etc/xdg/lubuntu/menus/lxgames-applications.menu --- lubuntu-default-settings-0.22~ppa1/etc/xdg/lubuntu/menus/lxgames-applications.menu 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/etc/xdg/lubuntu/menus/lxgames-applications.menu 2011-12-18 22:30:54.000000000 +0000 @@ -0,0 +1,199 @@ + + + Applications + lxde-menu-applications.directory + + + + + + + Action + ArcadeGame + BoardGame + CardGame + Education + Emulator + LogicGame + Simulation + SportsGame + Strategy + Other + Settings + + + Action + + + Game + ActionGame + Education + + + + + ArcadeGame + + + Game + ArcadeGame + Education + + + + + BoardGame + + + Game + BoardGame + Education + + + + + CardGame + + + Game + CardGame + Education + + + + + Education + + + Education + Game + + + + + Emulator + + + Game + Emulator + Education + + + + + LogicGame + + + Game + LogicGame + Education + + + + + Simulation + + + Game + Simulation + Education + + + + + SportsGame + + + Game + SportsGame + Education + + + + + Strategy + + + Game + StrategyGame + Education + + + + + Other + + + Game + ActionGame + ArcadeGame + BoardGame + CardGame + Emulator + LogicGame + Simulation + SportsGame + StrategyGame + Education + + + + + Settings + lxde-settings.directory + + + System + PackageManager + Game + + + + + Settings + Game + + + + + + + Graphics + Work/Graphics + + + Accessories + Work/Accessories + + + Development + Work/Development + + + Education + Learn + + + Games + Play/Games + + + Multimedia + Play/Multimedia + + + Office + Work/Office + + + System + Settings + + + + wine-wine + Work/wine-wine + + + diff -Nru lubuntu-default-settings-0.22~ppa1/usr/bin/startlubuntu lubuntu-default-settings-0.24~ppa1/usr/bin/startlubuntu --- lubuntu-default-settings-0.22~ppa1/usr/bin/startlubuntu 2011-11-07 10:12:49.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/usr/bin/startlubuntu 2011-12-18 22:38:03.000000000 +0000 @@ -46,6 +46,11 @@ cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc" fi +# Install custom configuration for xscreensaver +if [ ! -f "$HOME/.xscreensaver" ]; then + cp /usr/share/lubuntu/xscreensaver/xscreensaver "$HOME/.xscreensaver" +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 -Nru lubuntu-default-settings-0.22~ppa1/usr/bin/startlubuntu-lxgames lubuntu-default-settings-0.24~ppa1/usr/bin/startlubuntu-lxgames --- lubuntu-default-settings-0.22~ppa1/usr/bin/startlubuntu-lxgames 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/usr/bin/startlubuntu-lxgames 2011-12-18 23:01:59.000000000 +0000 @@ -0,0 +1,69 @@ +#!/bin/sh + +#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/gdm:/var/lib/menu-xdg" + else + XDG_DATA_DIRS="/etc/xdg/lubuntu:$XDG_DATA_DIRS:/usr/share:/usr/share/gdm:/var/lib/menu-xdg" +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 + +# Install custom configuration for leafpad +LEAFPAD_CONF_DIR="$XDG_CONFIG_HOME/leafpad" +if [ ! -f "$LEAFPAD_CONF_DIR/leafpadrc" ]; then + mkdir -p "$LEAFPAD_CONF_DIR" + cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc" +fi + +# Install custom configuration for xscreensaver +if [ ! -f "$HOME/.xscreensaver" ]; then + cp /usr/share/lubuntu/xscreensaver/xscreensaver "$HOME/.xscreensaver" +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="lxgames-" + +# 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 diff -Nru lubuntu-default-settings-0.22~ppa1/usr/bin/startlubuntu-netbook lubuntu-default-settings-0.24~ppa1/usr/bin/startlubuntu-netbook --- lubuntu-default-settings-0.22~ppa1/usr/bin/startlubuntu-netbook 2011-11-07 10:12:49.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/usr/bin/startlubuntu-netbook 2011-12-18 22:38:03.000000000 +0000 @@ -46,6 +46,11 @@ cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc" fi +# Install custom configuration for xscreensaver +if [ ! -f "$HOME/.xscreensaver" ]; then + cp /usr/share/lubuntu/xscreensaver/xscreensaver "$HOME/.xscreensaver" +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 -Nru lubuntu-default-settings-0.22~ppa1/usr/share/lubuntu/openbox/menu.xml lubuntu-default-settings-0.24~ppa1/usr/share/lubuntu/openbox/menu.xml --- lubuntu-default-settings-0.22~ppa1/usr/share/lubuntu/openbox/menu.xml 2011-11-07 10:12:49.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/usr/share/lubuntu/openbox/menu.xml 2011-12-18 22:38:03.000000000 +0000 @@ -1,8 +1,11 @@ - + - + yespcmanfm @@ -15,9 +18,8 @@ chromium-browser - - - + + diff -Nru lubuntu-default-settings-0.22~ppa1/usr/share/lubuntu/openbox/rc.xml lubuntu-default-settings-0.24~ppa1/usr/share/lubuntu/openbox/rc.xml --- lubuntu-default-settings-0.22~ppa1/usr/share/lubuntu/openbox/rc.xml 2011-11-07 10:12:49.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/usr/share/lubuntu/openbox/rc.xml 2011-12-18 22:38:03.000000000 +0000 @@ -1,7 +1,7 @@ - + 10 20 @@ -30,10 +30,16 @@
yes
- Any + Mouse + the active window is, 'Primary' - only on the primary monitor --> + Mouse + Lubuntu-default @@ -86,7 +92,16 @@ normal - + + Ubuntu Medium + 11 + + bold + + normal + + + Ubuntu Medium 11 @@ -165,71 +180,71 @@ C-g - - no + + left no - - no + + right no - - no + + up no - - no + + down no - - no + + left no - - no + + right no - - no + + up no - - no + + down no - - 1 + + 1 - - 2 + + 2 - - 3 + + 3 - - 4 + + 4 @@ -249,20 +264,64 @@ client-menu + + + + scrot -u -b + + - + + + + + + + - + + + + + + + yes yes + + + + + + + + + + + right + + + + + left + + + + + up - + + + down + + + @@ -272,20 +331,21 @@ pcmanfm - + lxpanelctl run - + - lxpanelctl menu + lxpanelctl run - + + - lxpanelctl run + lxpanelctl menu @@ -303,25 +363,24 @@ lxpanelctl menu + - - + + lxtask - - + - lxterminal + x-terminal-emulator - - - + + true @@ -330,80 +389,73 @@ pcmanfm - - - + + - scrot + amixer -q sset Master 3%+ - - + - scrot -s + amixer -q sset Master 3%- - - - -   -      -      amixer -q sset Master 3%+ -    -   - -   -      -       amixer -q sset Master 3%- -    -   - -   -      -       amixer -q sset Master toggle -    -   - -   -      -       x-terminal-emulator -    -   - -   -      -       galculator -    -   - -   -      -       pcmanfm -    -   - -   -      -       x-terminal-emulator -    -   - - + - xbacklight -dec 10 + x-terminal-emulator - + - xbacklight -inc 10 + x-terminal-emulator - --> - + + + + + galculator + + + + + + pcmanfm + + + + + + sleep 2;xset dpms force off + + + + + xbacklight -dec 10 + + + + + xbacklight -inc 10 + + + + + + scrot + + + + + + lubuntu-logout + + 8 @@ -414,6 +466,9 @@ + false + @@ -439,49 +494,74 @@ - + + previous + - + + next + - + + previous + - + + next + - + + previous + - + + next + - - - - - - - - - - + - - - - + + no + + + + + + + - + + yes + + + + + + + + + + + + + + + + @@ -492,11 +572,6 @@ - - - - - top @@ -504,10 +579,6 @@ - - - - left @@ -515,10 +586,6 @@ - - - - right @@ -526,20 +593,11 @@ - - - - bottom - - - - - @@ -548,35 +606,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -662,13 +692,17 @@ - + - + + vertical + - + + horizontal + @@ -683,22 +717,34 @@ - + + previous + - + + next + - + + previous + - + + next + - + + previous + - + + next + @@ -724,16 +770,24 @@ - + + previous + - + + next + - + + previous + - + + next + @@ -741,15 +795,24 @@ + /usr/share/lubuntu/openbox/menu.xml + menu.xml 200 no 100 - + + 400 + yes yes @@ -759,23 +822,30 @@ + + + yes + + + + + true + + diff -Nru lubuntu-default-settings-0.22~ppa1/usr/share/lubuntu/xscreensaver/xscreensaver lubuntu-default-settings-0.24~ppa1/usr/share/lubuntu/xscreensaver/xscreensaver --- lubuntu-default-settings-0.22~ppa1/usr/share/lubuntu/xscreensaver/xscreensaver 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/usr/share/lubuntu/xscreensaver/xscreensaver 2011-12-18 22:38:03.000000000 +0000 @@ -0,0 +1,2 @@ +mode: blank + diff -Nru lubuntu-default-settings-0.22~ppa1/usr/share/xsessions/lxgames.desktop lubuntu-default-settings-0.24~ppa1/usr/share/xsessions/lxgames.desktop --- lubuntu-default-settings-0.22~ppa1/usr/share/xsessions/lxgames.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.24~ppa1/usr/share/xsessions/lxgames.desktop 2011-12-18 23:07:29.000000000 +0000 @@ -0,0 +1,7 @@ +[Desktop Entry] +# The names/descriptions should really be better +Name=LX Games +Comment=LX Games - A collection of games, using LXDE desktop. +Exec=/usr/bin/startlubuntu-lxgames +# Icon= +Type=Application