diff -Nru lubuntu-default-settings-0.2~ppa3/debian/changelog lubuntu-default-settings-0.29~ppa6/debian/changelog --- lubuntu-default-settings-0.2~ppa3/debian/changelog 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/changelog 2012-08-29 21:04:16.000000000 +0000 @@ -1,4 +1,368 @@ -lubuntu-default-settings (0.2~ppa3) karmic; urgency=low +lubuntu-default-settings (0.29~ppa6) quantal; urgency=low + + * etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf: + - Use Lubuntu default icon theme. + - Use Lubuntu logo. + * debian/control: + - Increase depends on lightdm-gtk-greeter for the use of the new features. + + -- Julien Lavergne Wed, 29 Aug 2012 23:04:05 +0200 + +lubuntu-default-settings (0.28) quantal; urgency=low + + * debian/control: + - Move recommended packages to suggests, to not install them when installing + lubuntu-core (LP: #822043) + * usr/share/lxpanel/profile/Lubuntu/panels/panel: + - Set iconsize to 24 for the panel, to match new artwork. + - Add indicator support by default. + * etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf + - Add language-selector option to the greeter. + - Display Ubuntu font. + + -- Julien Lavergne Sun, 08 Jul 2012 23:24:18 +0200 + +lubuntu-default-settings (0.27) precise; urgency=low + + [ Bhaskar Kandiyal ] + * Changed default theme of lightdm to Lubuntu-default (LP: #968527) + + [ Julien Lavergne ] + * usr/share/lubuntu/openbox/rc.xml: + - Remove entries in the openbox menu which hang up if launched before + pcmanfm first run. + + -- Julien Lavergne Tue, 03 Apr 2012 23:14:06 +0200 + +lubuntu-default-settings (0.26) precise; urgency=low + + * debian/maintscript: + - Add missing file. + * etc/xdg/lxsession/*/desktop.conf: + - Add DMZ-white mouse cursor by default (LP: #923344) + * debian/control: + - Recommend dmz-cursor-theme for the mouse theme. + + -- Julien Lavergne Sun, 04 Mar 2012 00:58:20 +0100 + +lubuntu-default-settings (0.25) precise; urgency=low + + [ Julien Lavergne ] + * usr/share/lubuntu/openbox/rc.xml: + - Add ability to use icons in the menu. + - Add ability to use menu.xml in $HOME. + * usr/share/lubuntu/openbox/menu.xml: + - Update the openbox menu with the new version of Openbox. + + [ Valdur Kana ] + * usr/share/lubuntu/openbox/rc.xml: + - Unmute audio when using shortcut for the volume (LP: #926246) + - Use correct volume key for mute shortcut (LP: #926320) + + -- Julien Lavergne Thu, 23 Feb 2012 21:42:03 +0100 + +lubuntu-default-settings (0.24) precise; urgency=low + + [ Julien Lavergne ] + * usr/share/lubuntu/openbox/rc.xml + - Remove workaround for lxpanel run dialog, now it's fixed in lxpanel. + - Revert maximised windows by default, need more integration (LP: #926788) + * debian/control: + - Add a recommend for xscreensaver, for the locking shortcut (LP: #923001) + * usr/share/lxpanel/profile/Lubuntu/panels/panel: + - Set the color font of the panel to white to match the new theme. + + [ Colin Watson ] + * Use maintscript support in dh_installdeb rather than writing out + dpkg-maintscript-helper commands by hand. We now simply Pre-Depend on a + new enough version of dpkg rather than using 'dpkg-maintscript-helper + supports' guards, leading to more predictable behaviour on upgrades. + (LP: #932209) + + [ Alexander Andjelkovic ] + * Fixed super-keys were conflicting with other keybinds making them useless. + (LP: #890394) + + -- Julien Lavergne Sun, 19 Feb 2012 14:49:00 +0100 + +lubuntu-default-settings (0.23) precise; 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. + - Use horizontal presentation of the alt-tab. + - Add a shortcut to lock the screen (LP: #912499) + * usr/bin/startlubuntu* & usr/share/lubuntu/xscreensaver/xscreensaver: + - Add a custom configuration file for xscreensaver, with blank mode by + default (LP: #578789). + - Don't append /etc/xdg in xdg path, already done by Xsession.d + - Start gnome-keyring support for ssh before the session. Thanks urusha for + the patch (LP: #664206). + + -- Julien Lavergne Thu, 26 Jan 2012 00:48:09 +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 + * debian/{postinst,prerm}: install/remove alternatives to use our config + as /etc/lightdm/lightdm-gtk-greeter.conf. + * 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 Tue, 08 Nov 2011 20:00:37 +0100 + +lubuntu-default-settings (0.21) oneiric; urgency=low + + * debian/postinst,debian/postrm: set Lubuntu as the default session and + lightdm-gtk-greeter as the default greeter if they aren't set already. + Remove them on uninstall. (thanks Didier and Lionel !) + * etc/xdg/lubuntu/lxdm/lxdm.conf: + - Fix location of the background. + * usr/bin/startlubuntu* & usr/share/lubuntu/leafpad/ + - Install specific settings for leafpad, with Ubuntu font by default. + * etc/xdg/pcmanfm/pcmanfm.conf: + - Use Ubuntu font by default. + * usr/share/lubuntu/openbox/rc.xml: + - Use Ubuntu font by default instead of sans. (LP: #729885) + * usr/share/lxpanel/profile/Lubuntu/panels/panel: + - Set the color font of the panel to white to match the new theme. + + -- Julien Lavergne Sun, 21 Aug 2011 00:27:21 +0200 + +lubuntu-default-settings (0.20) oneiric; urgency=low + + [ Jonathan Marsden ] + * etc/xdg/lubuntu/menus/lxde-applications.menu: + - Avoid Audio, Video and AudioVideo applications appearing + in the Accessories menu (duplicating Sound & Video entries). + - Avoid applications in both System and Utility categories + appearing in the Accessories menu (duplicating System Tools + entries). (LP: #779818) + + [ Julien Lavergne ] + * usr/share/lubuntu/openbox/rc.xml + - Add Super_L, Super_R and ALt-F1 to keybindings for opening the menu. + * etc/xdg/lxsession/*/autostart: + - Don't autostart nm-applet, should be autostarted automatically. + - Use xfce4-power-manager instead of gnome-power-manager which depends now + on gnome-settings-daemon. + * etc/xdg/lubuntu/lxdm/lxdm.conf: + - Update with version in lxdm 0.4.0. + + -- Julien Lavergne Thu, 28 Jul 2011 23:42:29 +0200 + +lubuntu-default-settings (0.19) natty; urgency=low + + * etc/xdg/lubuntu/applications/default.list: + - Set Chromium as the default handler for http/https + - Use libreoffice instead of ooo2 + - Set apturl as the default handler for apturl + + -- Julien Lavergne Mon, 25 Apr 2011 21:11:38 +0200 + +lubuntu-default-settings (0.18) natty; urgency=low + + * etc/xdg/lubuntu/menus/lxde-applications.menu: + - Set name of the menu to Applications, to fix libfm-pref-apps. + + -- Julien Lavergne Thu, 17 Mar 2011 18:59:59 +0100 + +lubuntu-default-settings (0.17) natty; urgency=low + + [ Julien Lavergne ] + * etc/xdg/lubuntu/menus/lxde-applications.menu: + - Add a specific menu structure for lubuntu session. + * etc/xdg/lubuntu/lxdm/lxdm.conf + - Remove background option, it's already defined by the theme, and can break + it sometimes (LP: #703658). + + [ Jonathan Marsden ] + * etc/xdg/lubuntu/menus/lxde-applications.menu: + - Update DTD to use standards.freedesktop.org + - Move system-wide admin tools to System -> Administration menu + (LP: #650432) + + -- Julien Lavergne Mon, 21 Feb 2011 01:51:14 +0100 + +lubuntu-default-settings (0.16) natty; urgency=low + + * usr/bin + - Sync XDG_DATA_DIRS with lxde-common + * usr/share/lubuntu/openbox/rc.xml: + - Remove some unused code. + * debian/control + - Recommends amixer, scrot and galculator for some openbox keybindings. + * etc/xdg/pcmanfm/lubuntu.conf + - Move configuration file to etc/xdg/pcmanfm/lubuntu/pcmanfm.conf + (LP: #684796) + * debian/postrm,preinst,postinst + - Handle the location change for pcmanfm configuration using + dpkg-maintscript-helper. + + -- Julien Lavergne Mon, 06 Dec 2010 01:12:57 +0100 + +lubuntu-default-settings (0.15) natty; urgency=low + + * usr/bin/startlubuntu* + - Remove export XLIB_SKIP_ARGB_VISUALS=1, not needed since rgba support was + removed from gtk (LP: #673704). + * etc/xdg/lubuntu/applications/default.list: + - Set file-roller to open archives instead of xarchiver. + - Set audacious to open music files instead of aqualung. + * etc/xdg/lxsession/Lubuntu*/desktop.conf + - Switch to Ubuntu 11 font. + * debian/control: + - Depends on ttf-ubuntu-font-family. + + -- Julien Lavergne Fri, 03 Dec 2010 00:01:34 +0100 + +lubuntu-default-settings (0.14) natty; urgency=low + + * etc/xdg/lubuntu/lxdm/lxdm.conf + - Enable user list in lxdm 0.3.0. + * etc/xdg/lubuntu/applications/default.list + - Replace epdfview by evince. LP: #657335 + + -- Julien Lavergne Tue, 09 Nov 2010 22:53:38 +0100 + +lubuntu-default-settings (0.13) maverick; urgency=low + + * debian/postinst: + - Don't fail if the alternative file doesn't exist. (LP: #654211) + + -- Julien Lavergne Mon, 04 Oct 2010 23:16:56 +0200 + +lubuntu-default-settings (0.12) maverick; urgency=low + + * debian/postinst: + - Remove alternatives file if it's not a symlink (LP: #625485). + * debian/prerm: + - Don't remove alternative on upgrade. + + -- Julien Lavergne Sun, 03 Oct 2010 16:02:19 +0200 + +lubuntu-default-settings (0.11) maverick; urgency=low + + * usr/share/lubuntu/openbox/rc.xml: + - Use lxtask instead of xfce4-taskmanager (LP: #621317) + * etc/xdg/lxsession/Lubuntu*/desktop.conf + - Switch to lubuntu icon them. + * debian/control: + - Depends on lubuntu-icon-theme. + + -- Julien Lavergne Wed, 29 Sep 2010 00:33:56 +0200 + +lubuntu-default-settings (0.10) maverick; urgency=low + + * etc/xdg/lxsession/Lubuntu*/desktop.conf + - Set some Xft keys for better font rendering by default. LP: #518168 + * Set default gtk theme to Lubuntu-default. + + -- Julien Lavergne Mon, 02 Aug 2010 22:54:46 +0200 + +lubuntu-default-settings (0.9) maverick; urgency=low + + * usr/bin + - Add export XLIB_SKIP_ARGB_VISUALS=1 to disable rgba support, since + lxpanel doesn't support it. (See #589763) + - Remove check for pcmanfm conf file in home directory, pcmanfm2 handle + it correctly. + + -- Julien Lavergne Sun, 13 Jun 2010 10:54:23 +0200 + +lubuntu-default-settings (0.8) maverick; urgency=low + + * debian/control + - Depends on the re-written pcmanfm (>= 0.9.5). + * 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 + + -- Julien Lavergne Wed, 02 Jun 2010 01:28:01 +0200 + +lubuntu-default-settings (0.7) maverick; urgency=low + + * 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 + - Wrap build-depends and depends. + + -- Julien Lavergne Fri, 21 May 2010 19:13:16 +0200 + +lubuntu-default-settings (0.6) lucid; urgency=low + + * Set iconsize to 22 and panel height to 24 for panel settings. It displays + correct icons size for panel icons. Thanks Leszek Lesner. + * usr/bin/start* : + - From LXDE upstream, make sure dbus is launched when it's necessary. + - Add polkit-gnome-authentification-agent-1 to make polkit working again. + * Add custom defaults.list for applications by default. + * debian/dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482). + + -- Julien Lavergne Mon, 01 Mar 2010 00:35:26 +0100 + +lubuntu-default-settings (0.5) lucid; urgency=low + + * Add new Lubuntu-Netbook session, which launched lxlauncher by default. + * Add new configuration of lxdm for Lubuntu. + * debian/postinst & debian/prerm: Add a alternative lxdm.conf for Lubuntu + settings. + * autostart : Add nm-applet to the sessions. + * Use system-shutdown-panel icon for shutdown command and clean Encoding keys + * Use Chromium instead of Firefox inthe panel and openbox configuration. + * Remove cpu and netstat plugin, and move volume applet before the tray. + * Complete openbox keybindings for taking screenshot. Thanks Adam for the + patch. + * Switch to Lubuntu custom theme : + - debian/control : Depends on lubuntu-artwork (>= 0.4) and + elementary-icon-theme. + - desktop.conf : Use elementary-monochrome for icon theme. + - Use Clearlooks for Openbox theme. + - Use black font color for the panel. + + -- Julien Lavergne Wed, 17 Feb 2010 20:39:21 +0100 + +lubuntu-default-settings (0.4) lucid; urgency=low + + * Remove spacer before the menu applet on the panel. + * Use openbox menu on the desktop indead of pcmanfm one. + * Install configuration file for QT apps if no one is installed, and set + QT style=GTK+. + * Merge Leszek Lesner openbox settings. + + -- Julien Lavergne Sun, 24 Jan 2010 19:57:14 +0100 + +lubuntu-default-settings (0.3) lucid; urgency=low + + * Pass -e LXDE to lxsession to behave like a LXDE session. + Bump depends on lxsession to >= 0.4.1 to use this feature. + * Remove autostart for lxde-settings-daemon, it merged with lxsession. + * Change path to the wallpaper to a png file rather than a jpg. Bump depends + on lubuntu-artwork (>= 0.3) + + -- Julien Lavergne Sun, 13 Dec 2009 11:19:35 +0100 + +lubuntu-default-settings (0.2) lucid; urgency=low * Add the volume applet to the panel to have a way to configure the sound @@ -10,7 +374,7 @@ * Remove config file for lxsession, all is in desktop.conf * Depends on lubuntu-artwork (>= 0.2) to bring the new lxpanel background. - -- Julien Lavergne Fri, 06 Nov 2009 18:58:46 +0100 + -- Julien Lavergne Sat, 28 Nov 2009 00:21:07 +0100 lubuntu-default-settings (0.1) lucid; urgency=low diff -Nru lubuntu-default-settings-0.2~ppa3/debian/control lubuntu-default-settings-0.29~ppa6/debian/control --- lubuntu-default-settings-0.2~ppa3/debian/control 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/control 2012-08-29 21:03:18.000000000 +0000 @@ -2,7 +2,8 @@ Section: x11 Priority: optional Maintainer: Julien Lavergne -Build-Depends: debhelper (>= 7), intltool +Build-Depends: debhelper (>= 8.1.0~), + intltool Standards-Version: 3.8.3 Homepage: https://launchpad.net/~lubuntu-desktop Vcs-Bzr: lp:~lubuntu-desktop/+junk/lubuntu-default-settings @@ -10,6 +11,19 @@ Package: lubuntu-default-settings Architecture: all -Depends: ${misc:Depends}, lxsession (>= 0.3.9), lubuntu-artwork (>= 0.2) +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, + lxsession (>= 0.4.1), + lubuntu-artwork (>= 0.4), + lubuntu-icon-theme, + pcmanfm (>= 0.9.5), + ttf-ubuntu-font-family, + lightdm-gtk-greeter (>= 1.3.0) +Suggests: amixer, + scrot, + galculator, + xscreensaver, + dmz-cursor-theme +Provides: lightdm-gtk-greeter-config Description: default settings for Lubuntu Various system settings tailored for Lubuntu. diff -Nru lubuntu-default-settings-0.2~ppa3/debian/dirs lubuntu-default-settings-0.29~ppa6/debian/dirs --- lubuntu-default-settings-0.2~ppa3/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/dirs 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1 @@ +/etc/lxdm diff -Nru lubuntu-default-settings-0.2~ppa3/debian/maintscript lubuntu-default-settings-0.29~ppa6/debian/maintscript --- lubuntu-default-settings-0.2~ppa3/debian/maintscript 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/maintscript 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1 @@ +mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 diff -Nru lubuntu-default-settings-0.2~ppa3/debian/postinst lubuntu-default-settings-0.29~ppa6/debian/postinst --- lubuntu-default-settings-0.2~ppa3/debian/postinst 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/postinst 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,31 @@ +#!/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 [ "$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.2~ppa3/debian/postrm lubuntu-default-settings-0.29~ppa6/debian/postrm --- lubuntu-default-settings-0.2~ppa3/debian/postrm 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/postrm 2012-04-30 20:05:54.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.2~ppa3/debian/prerm lubuntu-default-settings-0.29~ppa6/debian/prerm --- lubuntu-default-settings-0.2~ppa3/debian/prerm 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/prerm 2012-04-30 20:05:54.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.2~ppa3/debian/rules lubuntu-default-settings-0.29~ppa6/debian/rules --- lubuntu-default-settings-0.2~ppa3/debian/rules 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/rules 2012-04-30 20:05:54.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.2~ppa3/debian/source/format lubuntu-default-settings-0.29~ppa6/debian/source/format --- lubuntu-default-settings-0.2~ppa3/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/debian/source/format 2013-10-31 15:02:47.722565689 +0000 @@ -0,0 +1 @@ +3.0 (native) diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/applications/defaults.list lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/applications/defaults.list --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/applications/defaults.list 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/applications/defaults.list 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,180 @@ +[Default Applications] +application/csv=gnumeric.desktop +application/excel=gnumeric.desktop +application/msexcel=gnumeric.desktop +application/msword=abiword.desktop +application/ogg=audacious2.desktop +application/pdf=evince.desktop +application/postscript=evince.desktop +application/rtf=abiword.desktop +application/tab-separated-values=gnumeric.desktop +application/vnd.lotus-1-2-3=gnumeric.desktop +application/vnd.ms-excel=gnumeric.desktop +application/vnd.ms-word=abiword.desktop +application/vnd.rn-realmedia=gnome-mplayer.desktop +application/vnd.sun.xml.calc=gnumeric.desktop +application/vnd.sun.xml.calc.template=gnumeric.desktop +application/vnd.sun.xml.draw=libreoffice-impress.desktop +application/vnd.sun.xml.draw.template=libreoffice-impress.desktop +application/vnd.sun.xml.math=libreoffice-math.desktop +application/vnd.sun.xml.writer=abiword.desktop +application/vnd.sun.xml.writer.template=abiword.desktop +application/vnd.sun.xml.writer.global=abiword.desktop +application/vnd.oasis.opendocument.formula=libreoffice-math.desktop +application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop +application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop +application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop +application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop +application/vnd.oasis.opendocument.spreadsheet=gnumeric.desktop +application/vnd.oasis.opendocument.spreadsheet-template=gnumeric.desktop +application/vnd.oasis.opendocument.text=abiword.desktop +application/vnd.oasis.opendocument.text-template=abiword.desktop +application/vnd.oasis.opendocument.text-web=abiword.desktop +application/vnd.oasis.opendocument.text-master=abiword.desktop +application/vnd.sun.xml.impress=libreoffice-impress.desktop +application/vnd.sun.xml.impress.template=libreoffice-impress.desktop +application/vnd.stardivision.calc=gnumeric.desktop +application/vnd.stardivision.draw=libreoffice-draw.desktop +application/vnd.stardivision.impress=libreoffice-impress.desktop +application/vnd.stardivision.math=libreoffice-math.desktop +application/vnd.stardivision.writer=abiword.desktop +application/mspowerpoint=libreoffice-impress.desktop +application/vnd.ms-powerpoint=libreoffice-impress.desktop +application/vnd.wordperfect=abiword.desktop +application/wordperfect=abiword.desktop +application/x-123=gnumeric.desktop +application/x-abiword=abiword.desktop +application/x-applix-spreadsheet=gnumeric.desktop +application/x-ar=file-roller.desktop +application/x-arj=file-roller.desktop +application/x-bzip-compressed-tar=file-roller.desktop +application/x-bzip=file-roller.desktop +application/x-cd-image=file-roller.desktop +application/x-compressed-tar=file-roller.desktop +application/x-compress=file-roller.desktop +application/x-deb=gdebi.desktop +application/x-debian-package=gdebi.desktop +application/x-dos_ms_excel=gnumeric.desktop +application/x-ear=file-roller.desktop +application/x-excel=gnumeric.desktop +application/x-extension-m4a=gnome-mplayer.desktop +application/x-extension-mp4=gnome-mplayer.desktop +application/x-flac=audacious2.desktop +application/x-glade=glade-2.desktop +application/x-gnumeric=gnumeric.desktop +application/x-gtar=file-roller.desktop +application/x-gzip=file-roller.desktop +application/x-gzpostscript=evince.desktop +application/xhtml+xml=chromium-browser.desktop +application/x-jar=file-roller.desktop +application/x-java-archive=file-roller.desktop +application/x-lha=file-roller.desktop +application/x-lhz=file-roller.desktop +application/xls=gnumeric.desktop +application/x-lzop=file-roller.desktop +application/x-matroska=gnome-mplayer.desktop +application/x-mps=gnumeric.desktop +application/x-ms-excel=gnumeric.desktop +application/x-msexcel=gnumeric.desktop +application/x-ogg=audacious2.desktop +application/x-oleo=gnumeric.desktop +application/x-perl=leafpad.desktop +application/x-planperfect=gnumeric.desktop +application/x-quattropro=gnumeric.desktop +application/x-rar-compressed=file-roller.desktop +application/x-rar=file-roller.desktop +application/x-rpm=file-roller.desktop +application/x-sc=gnumeric.desktop +application/x-shockwave-flash=gnome-mplayer.desktop +application/x-sylk=gnumeric.desktop +application/x-tar=file-roller.desktop +application/x-war=file-roller.desktop +application/x-xbase=gnumeric.desktop +application/x-xls=gnumeric.desktop +application/x-zip-compressed=file-roller.desktop +application/x-zip=file-roller.desktop +application/x-zoo=file-roller.desktop +application/zip=file-roller.desktop +audio/mpeg=audacious2.desktop +audio/mpegurl=audacious2.desktop +audio/vnd.rn-realaudio=audacious2.desktop +audio/x-flac=audacious2.desktop +audio/x-m4a=audacious2.desktop +audio/x-mp3=audacious2.desktop +audio/x-mpeg=audacious2.desktop +audio/x-mpegurl=audacious2.desktop +audio/x-ms-asf=audacious2.desktop +audio/x-ms-asx=audacious2.desktop +audio/x-ms-wax=audacious2.desktop +audio/x-pn-aiff=audacious2.desktop +audio/x-pn-au=audacious2.desktop +audio/x-pn-realaudio-plugin=audacious2.desktop +audio/x-pn-realaudio=audacious2.desktop +audio/x-pn-wav=audacious2.desktop +audio/x-pn-windows-acm=audacious2.desktop +audio/x-real-audio=audacious2.desktop +audio/x-scpls=audacious2.desktop +audio/x-wav=audacious2.desktop +image/bmp=gpicview.desktop +image/gif=gpicview.desktop +image/jpeg=gpicview.desktop +image/jpg=gpicview.desktop +image/pjpeg=gpicview.desktop +image/png=gpicview.desktop +image/svg+xml=gpicview.desktop +image/tiff=gpicview.desktop +image/vnd.rn-realpix=gnome-mplayer.desktop +image/x-bmp=gpicview.desktop +image/x-gray=gpicview.desktop +image/x-icb=gpicview.desktop +image/x-ico=gpicview.desktop +image/x-png=gpicview.desktop +image/x-portable-anymap=gpicview.desktop +image/x-portable-bitmap=gpicview.desktop +image/x-portable-graymap=gpicview.desktop +image/x-portable-pixmap=gpicview.desktop +image/x-psd=gpicview.desktop +image/x-xbitmap=gpicview.desktop +image/x-xpixmap=gpicview.desktop +inode/directory=pcmanfm.desktop +misc/ultravox=totem.desktop +multipart/x-zip=file-roller.desktop +text/abiword=abiword.desktop +text/comma-separated-values=gnumeric.desktop +text/csv=gnumeric.desktop +text/html=chromium-browser.desktop +text/plain=leafpad.desktop +text/richtext=abiword.desktop +text/rtf=abiword.desktop +text/spreadsheet=gnumeric.desktop +text/tab-separated-values=gnumeric.desktop +text/x-comma-separated-values=gnumeric.desktop +text/x-chdr=leafpad.desktop +text/x-csrc=leafpad.desktop +text/x-dtd=leafpad.desktop +text/x-java=leafpad.desktop +text/mathml=leafpad.desktop +text/x-python=leafpad.desktop +text/x-sql=leafpad.desktop +text/xml=chromium-browser.desktop +video/dv=gnome-mplayer.desktop +video/mp4=gnome-mplayer.desktop +video/mpeg=gnome-mplayer.desktop +video/msvideo=gnome-mplayer.desktop +video/quicktime=gnome-mplayer.desktop +video/vnd.rn-realvideo=gnome-mplayer.desktop +video/ogg=gnome-mplayer.desktop +video/x-anim=gnome-mplayer.desktop +video/x-avi=gnome-mplayer.desktop +video/x-flc=gnome-mplayer.desktop +video/x-fli=gnome-mplayer.desktop +video/x-mpeg=gnome-mplayer.desktop +video/x-ms-asf=gnome-mplayer.desktop +video/x-msvideo=gnome-mplayer.desktop +video/x-ms-wmv=gnome-mplayer.desktop +video/x-nsv=gnome-mplayer.desktop +x-directory/normal=pcmanfm.desktop +zz-application/zz-winassoc-xls=gnumeric.desktop +x-scheme-handler/apt=apturl.desktop +x-scheme-handler/http=chromium-browser.desktop +x-scheme-handler/https=chromium-browser.desktop diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/libfm/libfm.conf lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/libfm/libfm.conf --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/libfm/libfm.conf 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/libfm/libfm.conf 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,14 @@ +[config] +single_click=0 +use_trash=1 +confirm_del=1 +terminal=lxterminal %s +thumbnail_local=1 +thumbnail_max=2048 + +[ui] +big_icon_size=48 +small_icon_size=24 +pane_icon_size=24 +thumbnail_size=128 +show_thumbnail=1 diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf 2012-08-29 21:02:01.000000000 +0000 @@ -0,0 +1,23 @@ +# +# logo = Logo file to use, either an image absolute path, or a path relative to the greeter data directory +# background = Background file to use, either an image path or a color (e.g. #772953) +# theme-name = GTK+ theme to use +# icon-theme-name = Icon theme to use +# font-name = Font to use +# xft-antialias = Whether to antialias Xft fonts (true or false) +# xft-dpi = Resolution for Xft in dots per inch (e.g. 96) +# xft-hintstyle = What degree of hinting to use (hintnone, hintslight, hintmedium, or hintfull) +# xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr) +# show-language-selector (true or false) +# +[greeter] +logo=/usr/share/icons/lubuntu/places/128/start-here.svg +background=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png +theme-name=Lubuntu-default +icon-theme-name=lubuntu +font-name=Ubuntu +xft-antialias=true +#xft-dpi= +xft-hintstyle=hintfull +xft-rgba=rgb +show-language-selector=true diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/lxdm/lxdm.conf lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/lxdm/lxdm.conf --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/lxdm/lxdm.conf 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/lxdm/lxdm.conf 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,55 @@ +[base] +## uncomment and set autologin username to enable autologin +# autologin=dgod + +## uncomment and set timeout to enable timeout autologin, +## the value should >=5 +# timeout=10 + +## default session or desktop used when no systemwide config +session=/usr/bin/startlubuntu + +## uncomment and set to set numlock on your keyboard +# numlock=0 + +## set this if you don't want to put xauth file at ~/.Xauthority +# xauth_path=/tmp + +## greeter used to welcome the user +greeter=/usr/lib/lxdm/lxdm-greeter-gtk + +[server] +## arg used to start xserver, not fully function +# arg=/usr/bin/X -background vt1 + +[display] +## gtk theme used by greeter +gtk_theme=Clearlooks + +## background of the greeter +bg=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png + +## if show bottom pane +bottom_pane=1 + +## if show language select control +lang=1 + +## if show keyboard layout select control +keyboard=0 + +## the theme of greeter +theme=Lubuntu + +[input] + +[userlist] +## if disable the user list control at greeter +disable=0 + +## whitelist user +white= + +## blacklist user +black= + diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/menus/lxde-applications.menu lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/menus/lxde-applications.menu --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lubuntu/menus/lxde-applications.menu 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lubuntu/menus/lxde-applications.menu 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,162 @@ + + + + Applications + + + + + + + + Accessories + lxde-utility.directory + + + Utility + Accessibility + System + AudioVideo + Audio + Video + + + Core + Legacy + + + + + + Universal Access + lxde-utility-accessibility.directory + + + Accessibility + Settings + + + + + + Development + lxde-development.directory + + + Development + + emacs.desktop + + + + + Education + lxde-education.directory + + + Education + + + Science + Office + + + + + + Games + lxde-game.directory + + Game + + + + + Graphics + lxde-graphics.directory + + + Graphics + Utility + + + + + + Internet + lxde-network.directory + + Network + + + + + Multimedia + lxde-audio-video.directory + + Audio + Video + AudioVideo + + + + + Office + lxde-office.directory + + Office + + + + + Other + lxde-other.directory + + + + + + + + + Administration + lxde-system-tools.directory + + + Settings + System + + + System + + + + + + + DesktopSettings + lxde-settings.directory + + + Settings + + + System + + + + + + + + + Settings + + + + Administration + DesktopSettings + + + diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu/autostart lubuntu-default-settings-0.29~ppa6/etc/xdg/lxsession/Lubuntu/autostart --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu/autostart 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lxsession/Lubuntu/autostart 2012-04-30 20:05:54.000000000 +0000 @@ -1,5 +1,5 @@ -@lxde-settings-daemon -@xscreensaver -no-splash @lxpanel --profile Lubuntu -@gnome-power-manager -@pcmanfm -d +@xscreensaver -no-splash +@xfce4-power-manager +@pcmanfm --desktop --profile lubuntu +@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu/desktop.conf lubuntu-default-settings-0.29~ppa6/etc/xdg/lxsession/Lubuntu/desktop.conf --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu/desktop.conf 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lxsession/Lubuntu/desktop.conf 2012-04-30 20:05:54.000000000 +0000 @@ -2,14 +2,18 @@ window_manager=openbox-lubuntu [GTK] -sNet/ThemeName=Clearlooks -sNet/IconThemeName=nuoveXT2 -sGtk/FontName=Sans 10 +sNet/ThemeName=Lubuntu-default +sNet/IconThemeName=lubuntu +sGtk/FontName=Ubuntu 11 iGtk/ToolbarStyle=3 iGtk/ButtonImages=1 iGtk/MenuImages=1 iGtk/CursorThemeSize=18 iXft/Antialias=1 +iXft/Hinting=1 +sXft/HintStyle=hintslight +sXft/RGBA=rgb +sGtk/CursorThemeName=DMZ-White [Mouse] AccFactor=20 diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu-Netbook/autostart lubuntu-default-settings-0.29~ppa6/etc/xdg/lxsession/Lubuntu-Netbook/autostart --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu-Netbook/autostart 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lxsession/Lubuntu-Netbook/autostart 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,6 @@ +@lxlauncher +@lxpanel --profile Lubuntu +@xscreensaver -no-splash +@xfce4-power-manager +@pcmanfm --desktop +@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf lubuntu-default-settings-0.29~ppa6/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf --- lubuntu-default-settings-0.2~ppa3/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,25 @@ +[Session] +window_manager=openbox-lubuntu + +[GTK] +sNet/ThemeName=Lubuntu-default +sNet/IconThemeName=lubuntu +sGtk/FontName=Ubuntu 11 +iGtk/ToolbarStyle=3 +iGtk/ButtonImages=1 +iGtk/MenuImages=1 +iGtk/CursorThemeSize=18 +iXft/Antialias=1 +iXft/Hinting=1 +sXft/HintStyle=hintslight +sXft/RGBA=rgb +sGtk/CursorThemeName=DMZ-White + +[Mouse] +AccFactor=20 +AccThreshold=10 +LeftHanded=0 + +[Keyboard] +Delay=500 +Interval=30 diff -Nru lubuntu-default-settings-0.2~ppa3/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf lubuntu-default-settings-0.29~ppa6/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf --- lubuntu-default-settings-0.2~ppa3/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,21 @@ +[config] +bm_open_method=0 +su_cmd=gksu %s + +[desktop] +wallpaper_mode=1 +wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png +desktop_bg=#000000 +desktop_fg=#ffffff +desktop_shadow=#000000 +desktop_font=Ubuntu 11 + +[ui] +always_show_tabs=0 +hide_close_btn=0 +win_width=798 +win_height=547 +view_mode=0 +show_hidden=0 +sort_type=0 +sort_by=2 diff -Nru lubuntu-default-settings-0.2~ppa3/usr/bin/startlubuntu lubuntu-default-settings-0.29~ppa6/usr/bin/startlubuntu --- lubuntu-default-settings-0.2~ppa3/usr/bin/startlubuntu 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/bin/startlubuntu 2012-04-30 20:05:54.000000000 +0000 @@ -1,5 +1,10 @@ #!/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 @@ -10,25 +15,18 @@ then XDG_CONFIG_DIRS="/etc/xdg/lubuntu:/etc/xdg" else - XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS:/etc/xdg" + XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS" 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" + 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" + 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 pcmanfm config file -PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm" -if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then - mkdir -p "$PCMANFM_CONF_DIR" - cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/main.lubuntu" -fi - # Ensure the existance of openbox config file OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then @@ -36,11 +34,42 @@ 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="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 + +# Export Gnome-keyring variables if needed +# See bug #664206 +if which gnome-keyring-daemon >/dev/null; then + export $(/usr/bin/gnome-keyring-daemon --start --components=ssh) +fi + # Start the LXDE session -exec /usr/bin/lxsession -s Lubuntu +exec /usr/bin/lxsession -s Lubuntu -e LXDE diff -Nru lubuntu-default-settings-0.2~ppa3/usr/bin/startlubuntu-netbook lubuntu-default-settings-0.29~ppa6/usr/bin/startlubuntu-netbook --- lubuntu-default-settings-0.2~ppa3/usr/bin/startlubuntu-netbook 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/bin/startlubuntu-netbook 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,75 @@ +#!/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" +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="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 + +# Export Gnome-keyring variables if needed +# See bug #664206 +if which gnome-keyring-daemon >/dev/null; then + export $(/usr/bin/gnome-keyring-daemon --start --components=ssh) +fi + +# Start the LXDE session +exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/applications/lubuntu-logout.desktop lubuntu-default-settings-0.29~ppa6/usr/share/applications/lubuntu-logout.desktop --- lubuntu-default-settings-0.2~ppa3/usr/share/applications/lubuntu-logout.desktop 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/applications/lubuntu-logout.desktop 2012-04-30 20:05:54.000000000 +0000 @@ -1,8 +1,7 @@ [Desktop Entry] -Encoding=UTF-8 Name=Shutdown Name[zh_TW]=關機 Comment=Shutdown or Reboot -Icon=stock_exit +Icon=system-shutdown-panel Exec=lubuntu-logout NoDisplay=true diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/applications/lubuntu-screenlock.desktop lubuntu-default-settings-0.29~ppa6/usr/share/applications/lubuntu-screenlock.desktop --- lubuntu-default-settings-0.2~ppa3/usr/share/applications/lubuntu-screenlock.desktop 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/applications/lubuntu-screenlock.desktop 2012-04-30 20:05:54.000000000 +0000 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=ScreenLock Name[zh_TW]=鎖住螢幕 Comment=Lock your screen diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/leafpad/leafpadrc lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/leafpad/leafpadrc --- lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/leafpad/leafpadrc 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/leafpad/leafpadrc 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,7 @@ +0.8.17 +600 +400 +Ubuntu 11 +0 +0 +0 diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/openbox/menu.xml lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/openbox/menu.xml --- lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/openbox/menu.xml 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/openbox/menu.xml 2012-04-30 20:05:54.000000000 +0000 @@ -2,44 +2,210 @@ - - + + - yespcmanfm - pcmanfm + galculator + + yes + + - - lxterminal + + + gucharmap + + yes + + + + + + file-roller + + yes + + - - firefox + + + leafpad + + yes + + + + + + gpicview + + yes + + + + + + palimpset + + yes + + + + + + xpad + + yes + + - - - - - - + + + + pidgin + + yes + + + + + + sylpheed + + yes + + + + + + transmission + + yes + + + + + + + + + abiword + + + + + gnumeric + + + + + osmo + + + + + evince + + + + + + + + audacious + + yes + + + + + + gnome-mplayer + + yes + + + + + + xfburn + + yes + + + + + + guvcview + + yes + + + + + + + pcmanfm --desktop-pref yes - pcmanfm --show-pref 2 - + - yesopenbox obconf + yes - + + + + + + + + + + + + pcmanfm + + yes + + + + + + lxterminal + + yes + + + + + + chromium-browser + + yes + + + + + + + + + + - - lubuntu-logout + + + lubuntu-logout + diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/openbox/rc.xml lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/openbox/rc.xml --- lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/openbox/rc.xml 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/openbox/rc.xml 2012-04-30 20:05:54.000000000 +0000 @@ -1,50 +1,50 @@ - - - - - - 10 - 20 - - - - yes - - no - - yes - + yes + - no - - 200 - + 200 + - no - - - - - Smart - -
yes
- +
yes
+ - Any - - - - - Onyx - NLIMC - + Mouse + + + + Lubuntu-default + NLIMC + - yes - yes - - sans - 10 - - bold - - normal - - - - sans - 10 - - bold - - normal - - - - sans - 10 - - normal - - normal - - - - sans - 10 - - normal - - normal - - - - sans - 10 - - bold - - normal - - - - - - + bold + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + Ubuntu + 11 + + normal + + normal + + + + Ubuntu + 11 + + normal + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + + - 2 - 1 - - - - 875 - - - - - yes - Nonpixel - - Center - - - - - 10 - + Center + + + + 10 + - 10 - - - - - - - 0 - 0 - 0 - 0 - - - - TopLeft - - 0 - 0 - no - Above - - Vertical - - no - 300 - - 300 - - Middle - - - - - C-g - - - - nono - - - nono - - - nono - - - nono - - - nono - - - nono - - - nono - - - nono - - - 1 - - - 2 - - - 3 - - - 4 - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - - yesyes - - - - - - - - true - PCManFM - - pcmanfm - - - - - + + 0 + 0 + 0 + 0 + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + C-g + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + + + + + + + + + + + + + client-menu + + + + + + scrot -u -b + + + + + + icons + + + + + + + + + + + + + + + + + + + yes + yes + + + + + + + + + + + right + + + + + left + + + + + up + + + + + down + + + + + + + true + PCManFM + + pcmanfm + + + + lxpanelctl run - - - + + - lxpanelctl run + lxpanelctl run - - - + + + - lxpanelctl menu + lxpanelctl menu - - - - - - - - + + - xfce4-taskmanager + lxpanelctl menu - - - - - - - 8 - - 200 - - 400 - + + + + + + + lxtask + + + + + + x-terminal-emulator + + + + + + + true + PCManFM + + pcmanfm + + + + + + xscreensaver-command -lock + + + + + + amixer -q sset Master 3%+ unmute + + + + + amixer -q sset Master 3%- unmute + + + + + amixer -q sset Master toggle + + + + + + x-terminal-emulator + + + + + x-terminal-emulator + + + + + + galculator + + + + + + pcmanfm + + + + + + sleep 2;xset dpms force off + + + + + xbacklight -dec 10 + + + + + xbacklight -inc 10 + + + + + + scrot + + + + + + lubuntu-logout + + + + + 8 + + 200 + + 400 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - top - - - - - - - - - - left - - - - - - - - - - right - - - - - - - - - - bottom - - - - - - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-list-combined-menu - - - root-menu - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + top + + + + + + + left + + + + + + + right + + + + + + + bottom + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + + + horizontal + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + + + + client-list-combined-menu + + + + + root-menu + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + /usr/share/lubuntu/openbox/menu.xml + menu.xml - - /usr/share/lubuntu/openbox/menu.xml - 200 - - no - - 100 - - yes - - yes - - - - - + 100 + + 400 + + yes + + yes + + yes + + + + - + + + diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/pcmanfm/main.lubuntu lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/pcmanfm/main.lubuntu --- lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/pcmanfm/main.lubuntu 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/pcmanfm/main.lubuntu 2012-04-30 20:05:54.000000000 +0000 @@ -3,4 +3,5 @@ [Desktop] show_wallpaper=1 -wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.jpg +wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png +show_wm_menu=1 diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/qt/Trolltech.conf lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/qt/Trolltech.conf --- lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/qt/Trolltech.conf 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/qt/Trolltech.conf 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,2 @@ +[Qt] +style=GTK+ diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/xscreensaver/xscreensaver lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/xscreensaver/xscreensaver --- lubuntu-default-settings-0.2~ppa3/usr/share/lubuntu/xscreensaver/xscreensaver 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/lubuntu/xscreensaver/xscreensaver 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,2 @@ +mode: blank + diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/lxpanel/profile/Lubuntu/panels/panel lubuntu-default-settings-0.29~ppa6/usr/share/lxpanel/profile/Lubuntu/panels/panel --- lubuntu-default-settings-0.2~ppa3/usr/share/lxpanel/profile/Lubuntu/panels/panel 2009-11-26 19:06:25.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/lxpanel/profile/Lubuntu/panels/panel 2012-07-08 14:03:41.000000000 +0000 @@ -7,23 +7,17 @@ margin=0 widthtype=percent width=100 - height=26 + height=24 transparent=0 tintcolor=#000000 alpha=0 setdocktype=1 setpartialstrut=1 usefontcolor=1 - fontcolor=#ffffff + fontcolor=#000000 background=1 backgroundfile=/usr/share/lxpanel/images/lubuntu-background.png -} - -Plugin { - type = space - Config { - Size=2 - } + iconsize=24 } Plugin { @@ -53,7 +47,7 @@ id=pcmanfm.desktop } Button { - id=firefox.desktop + id=chromium-browser.desktop } } } @@ -110,15 +104,23 @@ } Plugin { - type = netstat + type = volumealsa } Plugin { - type = cpu + type = tray } Plugin { - type = tray + type = indicator + Config { + applications=1 + datetime=0 + messages=0 + network=0 + session=0 + sound=0 + } } Plugin { @@ -138,7 +140,3 @@ } } } - -Plugin { - type = volumealsa -} \ No newline at end of file diff -Nru lubuntu-default-settings-0.2~ppa3/usr/share/xsessions/Lubuntu-Netbook.desktop lubuntu-default-settings-0.29~ppa6/usr/share/xsessions/Lubuntu-Netbook.desktop --- lubuntu-default-settings-0.2~ppa3/usr/share/xsessions/Lubuntu-Netbook.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.29~ppa6/usr/share/xsessions/Lubuntu-Netbook.desktop 2012-04-30 20:05:54.000000000 +0000 @@ -0,0 +1,7 @@ +[Desktop Entry] +# The names/descriptions should really be better +Name=Lubuntu Netbook +Comment=Lubuntu Netbook - Lightweight X11 desktop environment based on LXDE +Exec=/usr/bin/startlubuntu-netbook +# Icon= +Type=Application