diff -Nru lubuntu-default-settings-0.32~ppa12/debian/changelog lubuntu-default-settings-0.32~ppa1/debian/changelog --- lubuntu-default-settings-0.32~ppa12/debian/changelog 2013-06-27 19:46:26.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/debian/changelog 2013-03-10 17:13:01.000000000 +0000 @@ -1,30 +1,8 @@ -lubuntu-default-settings (0.32~ppa12) saucy; urgency=low +lubuntu-default-settings (0.32~ppa1) raring; urgency=low - [ Julien Lavergne ] * Add a new QLubuntu session, by using only Qt applications - * usr/bin/start* - - Remove gnome-keyring workaround, since we have the proper fix for ssh. - * Use x-www-browser and x-terminal-emulator in more places. - * debian/* - - Update with the new QLubuntu session. - * debian/control: - - Depends on lxsession-logout since it's a separate binary. - * etc/xdg/lxsession : - - Use new lxsession features instead of autostart commands. - * usr/share/lubuntu/openbox/menu.xml - * usr/share/lubuntu/openbox/rc.xml - * usr/share/lubuntu/pcmanfm/main.lubuntu - - Use lxsession-default for terminal, screenshot and quit. - * usr/share/lubuntu/pcmanfm/main.lubuntu - * etc/xdg/lubuntu/libfm/libfm.conf - - Rebase with new upstream options. - * etc/xdg/lubuntu/applications/defaults.list - - Use Firefox instead of chromium-browser. - - [ Stéphane Graber ] - * Add startlubuntu upstart user job. - -- Julien Lavergne Thu, 27 Jun 2013 21:46:14 +0200 + -- Julien Lavergne Sun, 10 Mar 2013 18:12:57 +0100 lubuntu-default-settings (0.31) raring; urgency=low diff -Nru lubuntu-default-settings-0.32~ppa12/debian/control lubuntu-default-settings-0.32~ppa1/debian/control --- lubuntu-default-settings-0.32~ppa12/debian/control 2013-06-27 19:44:40.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/debian/control 2013-03-10 16:58:34.000000000 +0000 @@ -16,15 +16,14 @@ lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), lubuntu-icon-theme, - pcmanfm (>= 0.9.5) | pcmanfm-qt, + pcmanfm (>= 0.9.5), ttf-ubuntu-font-family, - lightdm, - lxsession-logout + lightdm Suggests: amixer, - scrot, - galculator, - xscreensaver, - dmz-cursor-theme + scrot, + galculator, + xscreensaver, + dmz-cursor-theme Description: default settings for Lubuntu Various system settings tailored for Lubuntu. @@ -66,20 +65,7 @@ Architecture: all Depends: ${misc:Depends}, lubuntu-default-settings, - razorqt-lightdm-greeter (>= 0.5.2) -Provides: razorqt-lightdm-greeter-config -Description: Set default session to QLubuntu version - This package sets the default session to QLubuntu version by default. - -Package: qlubuntu-data -Architecture: all -Depends: ${misc:Depends}, - lubuntu-default-settings, - razorqt-lightdm-greeter (>= 0.5.2), - qlubuntu-default-session -Recommends: razorqt-panel, - razorqt-policykit-agent, - razorqt-power, -Provides: razorqt-lightdm-greeter-config + lightdm-kde-greeter (>= 1.3.0) +Provides: lightdm-kde-greeter-config Description: Set default session to QLubuntu version This package sets the default session to QLubuntu version by default. diff -Nru lubuntu-default-settings-0.32~ppa12/debian/lubuntu-default-settings.install lubuntu-default-settings-0.32~ppa1/debian/lubuntu-default-settings.install --- lubuntu-default-settings-0.32~ppa12/debian/lubuntu-default-settings.install 2013-06-08 15:35:51.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/debian/lubuntu-default-settings.install 2013-03-10 16:41:35.000000000 +0000 @@ -4,7 +4,6 @@ usr/share/lubuntu/ usr/share/lxpanel/ usr/share/lxterminal/ -usr/share/upstart/sessions/ usr/share/xsessions/ usr/share/applications/lubuntu-screenlock.desktop usr/share/applications/lubuntu-browser.desktop diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lubuntu/applications/defaults.list lubuntu-default-settings-0.32~ppa1/etc/xdg/lubuntu/applications/defaults.list --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lubuntu/applications/defaults.list 2013-06-11 22:06:27.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lubuntu/applications/defaults.list 2013-03-10 16:41:35.000000000 +0000 @@ -65,7 +65,7 @@ application/x-gtar=file-roller.desktop application/x-gzip=file-roller.desktop application/x-gzpostscript=evince.desktop -application/xhtml+xml=firefox.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 @@ -142,7 +142,7 @@ text/abiword=abiword.desktop text/comma-separated-values=gnumeric.desktop text/csv=gnumeric.desktop -text/html=firefox.desktop +text/html=chromium-browser.desktop text/plain=leafpad.desktop text/richtext=abiword.desktop text/rtf=abiword.desktop @@ -156,7 +156,7 @@ text/mathml=leafpad.desktop text/x-python=leafpad.desktop text/x-sql=leafpad.desktop -text/xml=firefox.desktop +text/xml=chromium-browser.desktop video/dv=gnome-mplayer.desktop video/mp4=gnome-mplayer.desktop video/mpeg=gnome-mplayer.desktop @@ -176,5 +176,5 @@ x-directory/normal=pcmanfm.desktop zz-application/zz-winassoc-xls=gnumeric.desktop x-scheme-handler/apt=apturl.desktop -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop +x-scheme-handler/http=chromium-browser.desktop +x-scheme-handler/https=chromium-browser.desktop diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lubuntu/libfm/libfm.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lubuntu/libfm/libfm.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lubuntu/libfm/libfm.conf 2013-05-01 15:35:15.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lubuntu/libfm/libfm.conf 2013-03-10 16:41:35.000000000 +0000 @@ -2,21 +2,7 @@ single_click=0 use_trash=1 confirm_del=1 -confirm_trash=1 -advanced_mode=0 -si_unit=0 -force_startup_notify=1 -backup_as_hidden=1 -no_usb_trash=0 -no_child_non_expandable=0 -show_full_names=0 -only_user_templates=0 -template_run_app=0 -template_type_once=0 -auto_selection_delay=600 -drop_default_action=0 -show_internal_volumes=0 -terminal=lubuntu-default-terminal %s +terminal=lxterminal %s thumbnail_local=1 thumbnail_max=2048 @@ -26,9 +12,3 @@ pane_icon_size=16 thumbnail_size=128 show_thumbnail=1 - -[places] -places_home=1 -places_desktop=1 -places_trash=1 -places_applications=1 diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/LX-Games/conffiles.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/LX-Games/conffiles.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/LX-Games/conffiles.conf 2013-04-28 21:53:39.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/LX-Games/conffiles.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -[Openbox] -source=/usr/share/lubuntu/openbox/rc.xml - -[XScreensaver] -source=/usr/share/lubuntu/xscreensaver/xscreensaver - -[Qt] -source=/usr/share/lubuntu/qt/Trolltech.conf - -[Leafpad] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[LXterminal] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[libfm] -source=/etc/xdg/lubuntu/libfm/libfm.conf diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/LX-Games/desktop.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/LX-Games/desktop.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/LX-Games/desktop.conf 2013-06-26 20:58:53.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/LX-Games/desktop.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -[Session] -windows_manager/command=openbox -windows_manager/session=Lubuntu -windows_manager/extras= - -panel/command=lxpanel -panel/session=Lubuntu - -screensaver/command= - -power_manager/command=auto - -file_manager/command=pcmanfm -file_manager/session=lubuntu -file_manager/extras= - -desktop_manager/command=lxlauncher -desktop_manager/wallpaper= - -polkit/command=lxpolkit - -network_gui/command=auto - -audio_manager/command=alsamixer - -quit_manager/command=lxsession-logout -quit_manager/image=/usr/share/lubuntu/images/logout-banner.png -quit_manager/layout=top - -workspace_manager/command=obconf - -launcher_manager/command=lxpanelctl - -terminal_manager/command=x-terminal-emulator - -screenshot_manager/command=scrot - -upgrade_manager/command=update-manager - -clipboard/command=lxclipboard - -composite_manager/command= -composite_manager/autostart= - -disable_autostart=config-only - -upstart_user_session=false - -webbrowser/command=x-www-browser -webbrowser/desktop= - -[State] -laptop_mode=unknown - -[Dbus] -lxde=true -gnome=false - -[Keymap] -mode=system -model= -layout= -variant= -options= - -[XRandr] -mode= -command= - -[Security] -keyring=no - -[a11y] -activate=no -type= - -[Updates] -activate=true - -[Environment] -type=lubuntu -menu_prefix=lxgames- - -[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 -sGtk/ColorScheme= -iGtk/ToolbarIconSize=3 -iNet/EnableEventSounds=1 -iNet/EnableInputFeedbackSounds=1 - -[Mouse] -AccFactor=20 -AccThreshold=10 -LeftHanded=0 - -[Keyboard] -Delay=500 -Interval=30 diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu/autostart lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu/autostart --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu/autostart 2013-04-25 21:32:25.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu/autostart 2013-03-10 16:41:35.000000000 +0000 @@ -0,0 +1,5 @@ +@lxpanel --profile Lubuntu +@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.32~ppa12/etc/xdg/lxsession/Lubuntu/conffiles.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu/conffiles.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu/conffiles.conf 2013-04-28 21:53:39.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu/conffiles.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -[Openbox] -source=/usr/share/lubuntu/openbox/rc.xml - -[XScreensaver] -source=/usr/share/lubuntu/xscreensaver/xscreensaver - -[Qt] -source=/usr/share/lubuntu/qt/Trolltech.conf - -[Leafpad] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[LXterminal] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[libfm] -source=/etc/xdg/lubuntu/libfm/libfm.conf diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu/desktop.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu/desktop.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu/desktop.conf 2013-06-26 20:58:26.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu/desktop.conf 2013-03-10 16:41:35.000000000 +0000 @@ -1,86 +1,5 @@ [Session] -windows_manager/command=openbox -windows_manager/session=Lubuntu -windows_manager/extras= - -panel/command=lxpanel -panel/session=Lubuntu - -screensaver/command= - -power_manager/command=auto - -file_manager/command=pcmanfm -file_manager/session=lubuntu -file_manager/extras= - -desktop_manager/command=filemanager -desktop_manager/wallpaper= - -polkit/command=lxpolkit - -network_gui/command=auto - -audio_manager/command=alsamixer - -quit_manager/command=lxsession-logout -quit_manager/image=/usr/share/lubuntu/images/logout-banner.png -quit_manager/layout=top - -workspace_manager/command=obconf - -launcher_manager/command=lxpanelctl -launcher_manager/autostart=false - -terminal_manager/command=x-terminal-emulator - -screenshot_manager/command=scrot - -upgrade_manager/command=update-manager - -clipboard/command=lxclipboard - -composite_manager/command= -composite_manager/autostart= - -disable_autostart=config-only - -upstart_user_session=false - -webbrowser/command=x-www-browser -webbrowser/desktop= - -[State] -laptop_mode=unknown - -[Dbus] -lxde=true -gnome=false - -[Keymap] -mode=system -model= -layout= -variant= -options= - -[XRandr] -mode= -command= - -[Security] -keyring=no - -[a11y] -activate=no -type= - -[Updates] -activate=true - -[Environment] -type=lubuntu -menu_prefix=lxde- +window_manager=openbox-lubuntu [GTK] sNet/ThemeName=Lubuntu-default @@ -95,10 +14,6 @@ sXft/HintStyle=hintslight sXft/RGBA=rgb sGtk/CursorThemeName=DMZ-White -sGtk/ColorScheme= -iGtk/ToolbarIconSize=3 -iNet/EnableEventSounds=1 -iNet/EnableInputFeedbackSounds=1 [Mouse] AccFactor=20 diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Netbook/autostart lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Netbook/autostart --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Netbook/autostart 2013-04-25 21:32:25.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Netbook/autostart 2013-03-10 16:41:35.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.32~ppa12/etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf 2013-04-28 21:53:39.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -[Openbox] -source=/usr/share/lubuntu/openbox/rc.xml - -[XScreensaver] -source=/usr/share/lubuntu/xscreensaver/xscreensaver - -[Qt] -source=/usr/share/lubuntu/qt/Trolltech.conf - -[Leafpad] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[LXterminal] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[libfm] -source=/etc/xdg/lubuntu/libfm/libfm.conf diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf 2013-06-26 20:59:02.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf 2013-03-10 16:41:35.000000000 +0000 @@ -1,85 +1,5 @@ [Session] -windows_manager/command=openbox -windows_manager/session=Lubuntu -windows_manager/extras= - -panel/command=lxpanel -panel/session=Lubuntu - -screensaver/command= - -power_manager/command=auto - -file_manager/command=pcmanfm -file_manager/session=lubuntu -file_manager/extras= - -desktop_manager/command=lxlauncher -desktop_manager/wallpaper= - -polkit/command=lxpolkit - -network_gui/command=auto - -audio_manager/command=alsamixer - -quit_manager/command=lxsession-logout -quit_manager/image=/usr/share/lubuntu/images/logout-banner.png -quit_manager/layout=top - -workspace_manager/command=obconf - -launcher_manager/command=lxpanelctl - -terminal_manager/command=x-terminal-emulator - -screenshot_manager/command=scrot - -upgrade_manager/command=update-manager - -clipboard/command=lxclipboard - -composite_manager/command= -composite_manager/autostart= - -disable_autostart=config-only - -upstart_user_session=false - -webbrowser/command=x-www-browser -webbrowser/desktop= - -[State] -laptop_mode=unknown - -[Dbus] -lxde=true -gnome=false - -[Keymap] -mode=system -model= -layout= -variant= -options= - -[XRandr] -mode= -command= - -[Security] -keyring=no - -[a11y] -activate=no -type= - -[Updates] -activate=true - -[Environment] -type=lubuntu -menu_prefix=lxde- +window_manager=openbox-lubuntu [GTK] sNet/ThemeName=Lubuntu-default @@ -94,10 +14,6 @@ sXft/HintStyle=hintslight sXft/RGBA=rgb sGtk/CursorThemeName=DMZ-White -sGtk/ColorScheme= -iGtk/ToolbarIconSize=3 -iNet/EnableEventSounds=1 -iNet/EnableInputFeedbackSounds=1 [Mouse] AccFactor=20 diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Nexus7/autostart lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Nexus7/autostart --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Nexus7/autostart 2013-04-25 21:32:25.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Nexus7/autostart 2013-03-10 16:41:35.000000000 +0000 @@ -0,0 +1,6 @@ +xrotate +@lxlauncher +@lxpanel --profile Lubuntu-Nexus7 +@xfce4-power-manager +@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 +@onboard diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf 2013-05-01 14:18:03.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -[Openbox] -source=/usr/share/lubuntu/openbox/nexus-rc.xml - -[XScreensaver] -source=/usr/share/lubuntu/xscreensaver/xscreensaver - -[Qt] -source=/usr/share/lubuntu/qt/Trolltech.conf - -[Leafpad] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[LXterminal] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[libfm] -source=/etc/xdg/lubuntu/libfm/libfm.conf diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf 2013-06-26 20:58:58.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf 2013-03-10 16:41:35.000000000 +0000 @@ -1,85 +1,5 @@ [Session] -windows_manager/command=openbox -windows_manager/session=Lubuntu -windows_manager/extras= - -panel/command=lxpanel -panel/session=Lubuntu-Nexus7 - -screensaver/command= - -power_manager/command=auto - -file_manager/command=pcmanfm -file_manager/session=lubuntu -file_manager/extras= - -desktop_manager/command=lxlauncher -desktop_manager/wallpaper= - -polkit/command=lxpolkit - -network_gui/command=auto - -audio_manager/command=alsamixer - -quit_manager/command=lxsession-logout -quit_manager/image=/usr/share/lubuntu/images/logout-banner.png -quit_manager/layout=top - -workspace_manager/command=obconf - -launcher_manager/command=lxpanelctl - -terminal_manager/command=x-terminal-emulator - -screenshot_manager/command=scrot - -upgrade_manager/command=update-manager - -clipboard/command=lxclipboard - -composite_manager/command= -composite_manager/autostart= - -disable_autostart=config-only - -upstart_user_session=false - -webbrowser/command=x-www-browser -webbrowser/desktop= - -[State] -laptop_mode=unknown - -[Dbus] -lxde=true -gnome=false - -[Keymap] -mode=system -model= -layout= -variant= -options= - -[XRandr] -mode= -command= - -[Security] -keyring=no - -[a11y] -activate=yes -type=gnome - -[Updates] -activate=true - -[Environment] -type=lubuntu -menu_prefix=lxde- +window_manager=openbox-lubuntu [GTK] sNet/ThemeName=Lubuntu-default @@ -94,10 +14,6 @@ sXft/HintStyle=hintslight sXft/RGBA=rgb sGtk/CursorThemeName=DMZ-White -sGtk/ColorScheme= -iGtk/ToolbarIconSize=3 -iNet/EnableEventSounds=1 -iNet/EnableInputFeedbackSounds=1 [Mouse] AccFactor=20 diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/QLubuntu/conffiles.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/QLubuntu/conffiles.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/QLubuntu/conffiles.conf 2013-05-01 14:19:43.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/QLubuntu/conffiles.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -[Openbox] -source=/usr/share/lubuntu/openbox/qt-rc.xml - -[XScreensaver] -source=/usr/share/lubuntu/xscreensaver/xscreensaver - -[Qt] -source=/usr/share/lubuntu/qt/Trolltech.conf - -[Leafpad] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[LXterminal] -source=/usr/share/lubuntu/leafpad/leafpadrc - -[libfm] -source=/etc/xdg/lubuntu/libfm/libfm.conf diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/QLubuntu/desktop.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/QLubuntu/desktop.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/lxsession/QLubuntu/desktop.conf 2013-06-27 19:44:36.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/lxsession/QLubuntu/desktop.conf 2013-03-10 16:48:28.000000000 +0000 @@ -1,86 +1,98 @@ [Session] -windows_manager/command=openbox -windows_manager/session=Lubuntu -windows_manager/extras= +# Default program launched at startup +# Windows manager : Simple way to launch window manager (backward compatible). Let it empty if you want to use the advanced mode +window_manager=openbox-lubuntu + +# Window manager : Advanced mode to launch the window manager (with session, usefull for launching openbox with specific arguments (like configuration file) and extras commands) +window_manager/program= +window_manager/session= +window_manager/extras= -panel/command=razorqt-panel +# Panel and its session (if necessary) +panel/program= panel/session= -screensaver/command= +# Screensaver +screensaver/program= -power_manager/command=auto +# Power management +power-manager/program= -file_manager/command=pcmanfm -file_manager/session=lubuntu -file_manager/extras= +# File manager (session if necessary, extras commands if necessary) +file-manager/program= +file-manager/session= +file-manager/extras= -desktop_manager/command= -desktop_manager/wallpaper= +# Polkit agent (use lxpolkit to use build-in support if enable at build time) +polkit= -polkit/command=razor-policykit-agent +# Network GUI manager (auto to try to guess the best choice) +network_gui= -network_gui/command=auto +# Audio preferences (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.AudioManagerLaunch) +audio_manager= -audio_manager/command=alsamixer +# Logout dialog (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.QuitManagerLaunch) +quit_manager= -quit_manager/command=razor-power -quit_manager/image= -quit_manager/layout= +# Workspace manager (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.WorkspaceManagerLaunch) +workspace_manager= -workspace_manager/command= +# Launcher to launch applications (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.LauncherManagerLaunch) +launcher_manager= -launcher_manager/command= -launcher_manager/autostart= +# Terminal by default (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.TerminalManagerLaunch) +terminal_manager= -terminal_manager/command=x-terminal-emulator - -screenshot_manager/command=scrot - -upgrade_manager/command=update-manager - -clipboard/command=lxclipboard +# Clipboard support (use lxclipboard to use build-in support if enable at build time) +clipboard= +# Use a standalone composite manager (with possibility to autostart it) composite_manager/command= composite_manager/autostart= -disable_autostart=config-only - -upstart_user_session=false +# Disable autostart of applications in system and home autostart directory +disable_autostart=true -webbrowser/command=x-www-browser +# Default web browser (desktop is the corresponding desktop file) +webbrowser/command= webbrowser/desktop= [State] +# unknown if untested, yes if on laptop, no if not laptop_mode=unknown [Dbus] +# Default Dbus interfaces, should be always true lxde=true +# Implement gnome-session Dbus API gnome=false [Keymap] -mode=system +# Read configuration from : user (this file) or system +mode= +# Keyboard configuration for user mode, all 4 should be present model= layout= variant= options= [XRandr] +# Mode command only available mode= +# Command to launch for configuring Xrandr ex: xrandr --mode ... command= [Security] -keyring=no +# Default Keyring program +keyring=gnome-all [a11y] -activate=no -type= - -[Updates] -activate=true - -[Environment] -type=lubuntu -menu_prefix=lxde- +# Accessibility options +# Activate or not the following options +activate=yes +# Type of accessibility to enable (GNOME, KDE or other). Only GNOME supported now. +type=gnome [GTK] sNet/ThemeName=Lubuntu-default @@ -95,10 +107,6 @@ sXft/HintStyle=hintslight sXft/RGBA=rgb sGtk/CursorThemeName=DMZ-White -sGtk/ColorScheme= -iGtk/ToolbarIconSize=3 -iNet/EnableEventSounds=1 -iNet/EnableInputFeedbackSounds=1 [Mouse] AccFactor=20 diff -Nru lubuntu-default-settings-0.32~ppa12/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf lubuntu-default-settings-0.32~ppa1/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf --- lubuntu-default-settings-0.32~ppa12/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 2013-04-25 21:58:02.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 2013-03-10 16:41:35.000000000 +0000 @@ -2,30 +2,19 @@ bm_open_method=0 su_cmd=gksu %s -[volume] -mount_on_startup=1 -mount_removable=1 -autorun=1 - [desktop] wallpaper_mode=1 -wallpaper_common=1 -wallpapers_configured=1 wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png desktop_bg=#000000 desktop_fg=#ffffff desktop_shadow=#000000 desktop_font=Ubuntu 11 -show_wm_menu=0 -sort_type=0 -sort_by=7 [ui] always_show_tabs=0 -max_tab_chars=32 +hide_close_btn=0 win_width=798 win_height=547 -side_pane_mode=1 view_mode=0 show_hidden=0 sort_type=0 diff -Nru lubuntu-default-settings-0.32~ppa12/usr/bin/lubuntu-logout lubuntu-default-settings-0.32~ppa1/usr/bin/lubuntu-logout --- lubuntu-default-settings-0.32~ppa12/usr/bin/lubuntu-logout 2013-06-20 21:52:04.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/bin/lubuntu-logout 2013-03-10 16:41:35.000000000 +0000 @@ -1,2 +1,2 @@ #!/bin/sh -lxsession-default quit +lxsession-logout --banner "/usr/share/lubuntu/images/logout-banner.png" --side=top diff -Nru lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu --- lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu 2013-03-10 16:41:35.000000000 +0000 @@ -0,0 +1,89 @@ +#!/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 + +# Install custom lxterminal configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" ]; then + cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.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 + +# 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 SSH agent, require since 3.5 +# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) +SSHAGENT="/usr/bin/ssh-agent" +SSHAGENTARGS="-s" +if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT $SSHAGENTARGS` + trap "kill $SSH_AGENT_PID" 0 +fi + +# Start the LXDE session +exec /usr/bin/lxsession -s Lubuntu -e LXDE diff -Nru lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu-lxgames lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu-lxgames --- lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu-lxgames 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu-lxgames 2013-03-10 16:41:35.000000000 +0000 @@ -0,0 +1,89 @@ +#!/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 + +# Install custom lxterminal configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" ]; then + cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.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="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 + +# 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 SSH agent, require since 3.5 +# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) +SSHAGENT="/usr/bin/ssh-agent" +SSHAGENTARGS="-s" +if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT $SSHAGENTARGS` + trap "kill $SSH_AGENT_PID" 0 +fi + +# Start the LXDE session +exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE diff -Nru lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu-netbook lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu-netbook --- lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu-netbook 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu-netbook 2013-03-10 16:41:35.000000000 +0000 @@ -0,0 +1,89 @@ +#!/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 + +# Install custom lxterminal configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" ]; then + cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.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 + +# 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 SSH agent, require since 3.5 +# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) +SSHAGENT="/usr/bin/ssh-agent" +SSHAGENTARGS="-s" +if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT $SSHAGENTARGS` + trap "kill $SSH_AGENT_PID" 0 +fi + +# Start the LXDE session +exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE diff -Nru lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu-nexus7 lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu-nexus7 --- lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu-nexus7 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu-nexus7 2013-03-10 16:41:35.000000000 +0000 @@ -0,0 +1,90 @@ +#!/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 +# Specific configuration for Nexus7 session +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/nexus-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 + +# Install custom lxterminal configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" ]; then + cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.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="lubuntu-nexus7-" + +# 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 SSH agent, require since 3.5 +# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) +SSHAGENT="/usr/bin/ssh-agent" +SSHAGENTARGS="-s" +if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT $SSHAGENTARGS` + trap "kill $SSH_AGENT_PID" 0 +fi + +# Start the LXDE session +exec /usr/bin/lxsession -s Lubuntu-Nexus7 -e LXDE diff -Nru lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu-q lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu-q --- lubuntu-default-settings-0.32~ppa12/usr/bin/startlubuntu-q 1970-01-01 00:00:00.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/bin/startlubuntu-q 2013-03-10 16:51:44.000000000 +0000 @@ -0,0 +1,83 @@ +#!/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 + +# Install custom lxterminal configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" ]; then + cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.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 SSH agent, require since 3.5 +# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) +SSHAGENT="/usr/bin/ssh-agent" +SSHAGENTARGS="-s" +if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT $SSHAGENTARGS` + trap "kill $SSH_AGENT_PID" 0 +fi + +# Start the LXDE session +exec /usr/bin/lxsession -s QLubuntu -e LXDE diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/applications/lubuntu-logout.desktop lubuntu-default-settings-0.32~ppa1/usr/share/applications/lubuntu-logout.desktop --- lubuntu-default-settings-0.32~ppa12/usr/share/applications/lubuntu-logout.desktop 2013-04-28 21:32:12.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/applications/lubuntu-logout.desktop 2013-03-10 16:41:35.000000000 +0000 @@ -3,5 +3,5 @@ Name[zh_TW]=關機 Comment=Shutdown or Reboot Icon=system-shutdown-panel -Exec=lxsession-default quit +Exec=lubuntu-logout NoDisplay=true diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/applications/lubuntu-screenlock.desktop lubuntu-default-settings-0.32~ppa1/usr/share/applications/lubuntu-screenlock.desktop --- lubuntu-default-settings-0.32~ppa12/usr/share/applications/lubuntu-screenlock.desktop 2013-04-28 21:32:00.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/applications/lubuntu-screenlock.desktop 2013-03-10 16:41:35.000000000 +0000 @@ -3,5 +3,5 @@ Name[zh_TW]=鎖住螢幕 Comment=Lock your screen Icon=system-lock-screen -Exec=lxlock +Exec=xscreensaver-command -lock NoDisplay=true diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/openbox/menu.xml lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/openbox/menu.xml --- lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/openbox/menu.xml 2013-05-01 15:39:54.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/openbox/menu.xml 2013-03-10 16:41:35.000000000 +0000 @@ -167,7 +167,7 @@ - lxsession-default filemanager + pcmanfm yes @@ -175,15 +175,15 @@ - lxsession-default terminal + lxterminal yes - + - x-www-browser + chromium-browser yes @@ -199,7 +199,7 @@ - lxsession-default quit + lubuntu-logout diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/openbox/qlubuntu.xml lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/openbox/qlubuntu.xml --- lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/openbox/qlubuntu.xml 2013-04-25 21:32:25.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/openbox/qlubuntu.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ - - - - - - - - - speedcrunch - - yes - - - - - - - - - - - transmission-qt - - yes - - - - - - - - - - qpdfview - - - - - - - - smplayer - - yes - - - - - - smplayer - - yes - - - - - - - - - - pcmanfm-qt --desktop-pref - yes - - - - - obconf - yes - - - - - - - - - - - - - - - - pcmanfm-qt - - yes - - - - - - qterminal - - yes - - - - - - chromium-browser - - yes - - - - - - - - - - - - - - lubuntu-logout - - - - - diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/openbox/qt-rc.xml lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/openbox/qt-rc.xml --- lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/openbox/qt-rc.xml 2013-06-27 19:45:45.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/openbox/qt-rc.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,947 +0,0 @@ - - - - - 10 - 20 - - - yes - - no - - yes - - no - - 200 - - no - - - - Smart - -
yes
- - Mouse - - Mouse - - - - Lubuntu-default - NLIMC - - yes - yes - - Ubuntu Medium - 11 - - 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 - - - - no - Nonpixel - - Center - - - - 10 - - 10 - - - - - - 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 - - - - # HalfLeftScreen - - - 0 - 0 - 97% - 50% - - - # HalfRightScreen - - - -0 - 0 - 97% - 50% - - - # HalfUpperScreen - - - 0 - 0 - 100% - 50% - - - # HalfLowerScreen - - - 0 - -0 - 100% - 50% - - - - - - - true - PCManFM - - pcmanfm-qt - - - - - - lxpanelctl run - - - - - lxpanelctl run - - - - - - lxpanelctl menu - - - - - lxpanelctl menu - - - - - - - - - - lxtask - - - - - - x-terminal-emulator - - - - - - - true - PCManFM - - pcmanfm-qt - - - - - - lxlock - - - - - - 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-qt - - - - - - sleep 2;xset dpms force off - - - - - xbacklight -dec 10 - - - - - xbacklight -inc 10 - - - - - - scrot - - - - - - lxsession-default quit - - - - - 8 - - 200 - - 400 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/qlubuntu-menu.xml - qlubuntu--menu.xml - - 200 - - no - - 100 - - 400 - - yes - - yes - - yes - - - - - - - - - diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/openbox/rc.xml lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/openbox/rc.xml --- lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/openbox/rc.xml 2013-04-25 21:32:25.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/openbox/rc.xml 2013-03-10 16:41:35.000000000 +0000 @@ -267,7 +267,7 @@ - lxsession-default screenshot window + scrot -u -b @@ -404,7 +404,7 @@ - lxsession-default terminal + x-terminal-emulator @@ -442,12 +442,12 @@ - lxsession-default terminal + x-terminal-emulator - lxsession-default terminal + x-terminal-emulator @@ -481,13 +481,13 @@ - lxsession-default screenshot + scrot - lxsession-default quit + lubuntu-logout diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/pcmanfm/main.lubuntu lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/pcmanfm/main.lubuntu --- lubuntu-default-settings-0.32~ppa12/usr/share/lubuntu/pcmanfm/main.lubuntu 2013-04-25 21:34:28.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/lubuntu/pcmanfm/main.lubuntu 2013-03-10 16:41:35.000000000 +0000 @@ -1,5 +1,5 @@ [General] -terminal=lxsession-default terminal +terminal=lxterminal [Desktop] show_wallpaper=1 diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/lxpanel/profile/Lubuntu/config lubuntu-default-settings-0.32~ppa1/usr/share/lxpanel/profile/Lubuntu/config --- lubuntu-default-settings-0.32~ppa12/usr/share/lxpanel/profile/Lubuntu/config 2013-04-26 21:53:05.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/lxpanel/profile/Lubuntu/config 2013-03-10 16:41:35.000000000 +0000 @@ -1,4 +1,4 @@ [Command] -FileManager=lxsession-default filemanager -Terminal=lxsession-default terminal -Logout=lxsession-default quit +FileManager=pcmanfm %s +Terminal=lxterminal -e +Logout=lubuntu-logout diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/lxpanel/profile/Lubuntu-Nexus7/config lubuntu-default-settings-0.32~ppa1/usr/share/lxpanel/profile/Lubuntu-Nexus7/config --- lubuntu-default-settings-0.32~ppa12/usr/share/lxpanel/profile/Lubuntu-Nexus7/config 2013-04-25 21:30:54.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/lxpanel/profile/Lubuntu-Nexus7/config 2013-03-10 16:41:35.000000000 +0000 @@ -1,4 +1,4 @@ [Command] FileManager=pcmanfm %s -Terminal=x-terminal-emulator -e +Terminal=lxterminal -e Logout=lubuntu-logout diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/upstart/sessions/lxsession.conf lubuntu-default-settings-0.32~ppa1/usr/share/upstart/sessions/lxsession.conf --- lubuntu-default-settings-0.32~ppa12/usr/share/upstart/sessions/lxsession.conf 2013-06-08 15:35:51.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/upstart/sessions/lxsession.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -description "Lubuntu session" -author "Stéphane Graber " - -start on started dbus and xsession SESSIONTYPE=lxsession - -emits desktop-start -emits desktop-end - -exec /usr/bin/lxsession -s $DESKTOP_SESSION -e LXDE - -post-start exec initctl emit desktop-start DESKTOP_SESSION=$DESKTOP_SESSION - -# Don't wait to avoid blocking the session from ending. -pre-stop exec initctl emit --no-wait desktop-end DESKTOP_SESSION=$DESKTOP_SESSION - -post-stop exec dbus-send --type=method_call --address=$UPSTART_SESSION /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/Lubuntu-Netbook.desktop lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/Lubuntu-Netbook.desktop --- lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/Lubuntu-Netbook.desktop 2013-05-01 14:16:55.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/Lubuntu-Netbook.desktop 2013-03-10 16:41:35.000000000 +0000 @@ -2,6 +2,6 @@ # The names/descriptions should really be better Name=Lubuntu Netbook Comment=Lubuntu Netbook - Lightweight X11 desktop environment based on LXDE -Exec=/usr/bin/lxsession -s Lubuntu-Netbook -e LXDE +Exec=/usr/bin/startlubuntu-netbook # Icon= Type=Application diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/Lubuntu.desktop lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/Lubuntu.desktop --- lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/Lubuntu.desktop 2013-04-27 13:45:36.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/Lubuntu.desktop 2013-03-10 16:41:35.000000000 +0000 @@ -5,6 +5,6 @@ Comment[zh_TW]=Lubuntu - 輕量級的 X11 桌面環境 Comment[fi]=Lubuntu - kevyt X11-työpöytäympäristö Comment[ja]=Lubuntu - 軽量な X11 デスクトップ環境 -Exec=/usr/bin/lxsession -s Lubuntu -e LXDE +Exec=/usr/bin/startlubuntu # Icon= Type=Application diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/lubuntu-nexus7.desktop lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/lubuntu-nexus7.desktop --- lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/lubuntu-nexus7.desktop 2013-05-01 14:23:34.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/lubuntu-nexus7.desktop 2013-03-10 16:41:35.000000000 +0000 @@ -1,6 +1,6 @@ [Desktop Entry] Name=Lubuntu Nexus7 session Comment=A specific Lubuntu session optimised for Nexus7 -Exec=/usr/bin/lxsession -s Lubuntu-Nexus7 -e LXDE +Exec=/usr/bin/startlubuntu-nexus7 # Icon= Type=Application diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/lxgames.desktop lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/lxgames.desktop --- lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/lxgames.desktop 2013-05-01 14:17:17.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/lxgames.desktop 2013-03-10 16:41:35.000000000 +0000 @@ -2,6 +2,6 @@ # The names/descriptions should really be better Name=LX Games Comment=LX Games - A collection of games, using LXDE desktop. -Exec=/usr/bin/lxsession -s LX-Games -e LXDE +Exec=/usr/bin/startlubuntu-lxgames # Icon= Type=Application diff -Nru lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/qlubuntu.desktop lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/qlubuntu.desktop --- lubuntu-default-settings-0.32~ppa12/usr/share/xsessions/qlubuntu.desktop 2013-05-01 14:23:16.000000000 +0000 +++ lubuntu-default-settings-0.32~ppa1/usr/share/xsessions/qlubuntu.desktop 2013-03-10 16:50:21.000000000 +0000 @@ -1,6 +1,6 @@ [Desktop Entry] Name=Lubuntu Qt session Comment=A specific Lubuntu session using Qt -Exec=/usr/bin/lxsession -s QLubuntu -e LXDE +Exec=/usr/bin/startlubuntu-q # Icon= Type=Application