* etc/xdg/lubuntu/menus/lxgames-applications.menu :
- Add a specific menu structure for a games session. * usr/bin/startlubuntu-lxgames : - Add a new script to start a games session, with a specific menu structure. * usr/share/xsessions/lxgames.desktop : - Add a new session to start a games session. * debian/control: - Add new binaries, to configure default session on lightdm. * Reorganize script in debian/ to handle the creation of the new default-session binaries. * debian/lubuntu-default-settings.install: - Keep all files in lubuntu-default-settings.
This commit is contained in:
Julien Lavergne
commit
84cb72da30
14
debian/changelog
vendored
14
debian/changelog
vendored
@ -9,8 +9,20 @@ lubuntu-default-settings (0.30) UNRELEASED; urgency=low
|
|||||||
* usr/share/lubuntu/openbox/rc.xml
|
* usr/share/lubuntu/openbox/rc.xml
|
||||||
- Add shortcuts for windows tiling (SuperKey + the direction).
|
- Add shortcuts for windows tiling (SuperKey + the direction).
|
||||||
- Set drawContents to "no" on resize, to reduce the use of resize.
|
- Set drawContents to "no" on resize, to reduce the use of resize.
|
||||||
|
* etc/xdg/lubuntu/menus/lxgames-applications.menu :
|
||||||
|
- Add a specific menu structure for a games session.
|
||||||
|
* usr/bin/startlubuntu-lxgames :
|
||||||
|
- Add a new script to start a games session, with a specific menu structure.
|
||||||
|
* usr/share/xsessions/lxgames.desktop :
|
||||||
|
- Add a new session to start a games session.
|
||||||
|
* debian/control:
|
||||||
|
- Add new binaries, to configure default session on lightdm.
|
||||||
|
* Reorganize script in debian/ to handle the creation of the new
|
||||||
|
default-session binaries.
|
||||||
|
* debian/lubuntu-default-settings.install:
|
||||||
|
- Keep all files in lubuntu-default-settings.
|
||||||
|
|
||||||
-- Julien Lavergne <gilir@freedom> Mon, 22 Oct 2012 22:26:04 +0200
|
-- Julien Lavergne <gilir@ubuntu.com> Mon, 22 Oct 2012 22:26:04 +0200
|
||||||
|
|
||||||
lubuntu-default-settings (0.29) quantal; urgency=low
|
lubuntu-default-settings (0.29) quantal; urgency=low
|
||||||
|
|
||||||
|
|||||||
14
debian/control
vendored
14
debian/control
vendored
@ -27,3 +27,17 @@ Suggests: amixer,
|
|||||||
Provides: lightdm-gtk-greeter-config
|
Provides: lightdm-gtk-greeter-config
|
||||||
Description: default settings for Lubuntu
|
Description: default settings for Lubuntu
|
||||||
Various system settings tailored for Lubuntu.
|
Various system settings tailored for Lubuntu.
|
||||||
|
|
||||||
|
Package: lxgames-default-session
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends},
|
||||||
|
lubuntu-default-settings
|
||||||
|
Description: Set default session to lxgames
|
||||||
|
Set default session to lxgames.
|
||||||
|
|
||||||
|
Package: lubuntu-default-session
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends},
|
||||||
|
lubuntu-default-settings
|
||||||
|
Description: Set default session to lxgames
|
||||||
|
Set default session to Lubuntu.
|
||||||
|
|||||||
15
debian/lubuntu-default-session.postinst
vendored
Normal file
15
debian/lubuntu-default-session.postinst
vendored
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
configure|upgrade)
|
||||||
|
if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
|
||||||
|
/usr/lib/lightdm/lightdm-set-defaults --keep-old --session=Lubuntu || true
|
||||||
|
/usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
#DEBHELPER#
|
||||||
|
exit 0
|
||||||
2
debian/lubuntu-default-settings.install
vendored
Normal file
2
debian/lubuntu-default-settings.install
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
etc/
|
||||||
|
usr/
|
||||||
@ -18,14 +18,5 @@ if [ "$1" = "configure" ] ; then
|
|||||||
/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf 30
|
/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf 30
|
||||||
fi
|
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#
|
#DEBHELPER#
|
||||||
exit 0
|
exit 0
|
||||||
16
debian/lubuntu-default-settings.postrm
vendored
Normal file
16
debian/lubuntu-default-settings.postrm
vendored
Normal file
@ -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
|
||||||
15
debian/lxgames-default-session.postinst
vendored
Normal file
15
debian/lxgames-default-session.postinst
vendored
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
configure|upgrade)
|
||||||
|
if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
|
||||||
|
/usr/lib/lightdm/lightdm-set-defaults --keep-old --session=lxgames || true
|
||||||
|
/usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-gtk-greeter || true
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
#DEBHELPER#
|
||||||
|
exit 0
|
||||||
16
debian/lxgames-default-session.postrm
vendored
Normal file
16
debian/lxgames-default-session.postrm
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
remove|purge)
|
||||||
|
if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
|
||||||
|
/usr/lib/lightdm/lightdm-set-defaults --remove --session=lxgames || true
|
||||||
|
/usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-gtk-greeter || true
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
#DEBHELPER#
|
||||||
|
exit 0
|
||||||
199
etc/xdg/lubuntu/menus/lxgames-applications.menu
Normal file
199
etc/xdg/lubuntu/menus/lxgames-applications.menu
Normal file
@ -0,0 +1,199 @@
|
|||||||
|
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
||||||
|
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
||||||
|
<Menu>
|
||||||
|
<Name>Applications</Name>
|
||||||
|
<Directory>lxde-menu-applications.directory</Directory>
|
||||||
|
<DefaultAppDirs/>
|
||||||
|
<DefaultDirectoryDirs/>
|
||||||
|
<DefaultMergeDirs/>
|
||||||
|
|
||||||
|
<Layout>
|
||||||
|
<Merge type="menus"/>
|
||||||
|
<Menuname>Action</Menuname>
|
||||||
|
<Menuname>ArcadeGame</Menuname>
|
||||||
|
<Menuname>BoardGame</Menuname>
|
||||||
|
<Menuname>CardGame</Menuname>
|
||||||
|
<Menuname>Education</Menuname>
|
||||||
|
<Menuname>Emulator</Menuname>
|
||||||
|
<Menuname>LogicGame</Menuname>
|
||||||
|
<Menuname>Simulation</Menuname>
|
||||||
|
<Menuname>SportsGame</Menuname>
|
||||||
|
<Menuname>Strategy</Menuname>
|
||||||
|
<Menuname>Other</Menuname>
|
||||||
|
<Menuname>Settings</Menuname>
|
||||||
|
</Layout>
|
||||||
|
<Menu>
|
||||||
|
<Name>Action</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>ActionGame</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>ArcadeGame</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>ArcadeGame</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>BoardGame</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>BoardGame</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>CardGame</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>CardGame</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>Education</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Education</Category>
|
||||||
|
<Not><Category>Game</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>Emulator</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>Emulator</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>LogicGame</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>LogicGame</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>Simulation</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>Simulation</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>SportsGame</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>SportsGame</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>Strategy</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Category>StrategyGame</Category>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>Other</Name>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
<Not><Category>ActionGame</Category></Not>
|
||||||
|
<Not><Category>ArcadeGame</Category></Not>
|
||||||
|
<Not><Category>BoardGame</Category></Not>
|
||||||
|
<Not><Category>CardGame</Category></Not>
|
||||||
|
<Not><Category>Emulator</Category></Not>
|
||||||
|
<Not><Category>LogicGame</Category></Not>
|
||||||
|
<Not><Category>Simulation</Category></Not>
|
||||||
|
<Not><Category>SportsGame</Category></Not>
|
||||||
|
<Not><Category>StrategyGame</Category></Not>
|
||||||
|
<Not><Category>Education</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
<Menu>
|
||||||
|
<Name>Settings</Name>
|
||||||
|
<Directory>lxde-settings.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>System</Category>
|
||||||
|
<Category>PackageManager</Category>
|
||||||
|
<Not><Category>Game</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Settings</Category>
|
||||||
|
<Not><Category>Game</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu>
|
||||||
|
|
||||||
|
<!-- Add some dirty hacks to map gnome categories to lxlauncher ones for merges -->
|
||||||
|
<Move>
|
||||||
|
<Old>Graphics</Old>
|
||||||
|
<New>Work/Graphics</New>
|
||||||
|
</Move>
|
||||||
|
<Move>
|
||||||
|
<Old>Accessories</Old>
|
||||||
|
<New>Work/Accessories</New>
|
||||||
|
</Move>
|
||||||
|
<Move>
|
||||||
|
<Old>Development</Old>
|
||||||
|
<New>Work/Development</New>
|
||||||
|
</Move>
|
||||||
|
<Move>
|
||||||
|
<Old>Education</Old>
|
||||||
|
<New>Learn</New>
|
||||||
|
</Move>
|
||||||
|
<Move>
|
||||||
|
<Old>Games</Old>
|
||||||
|
<New>Play/Games</New>
|
||||||
|
</Move>
|
||||||
|
<Move>
|
||||||
|
<Old>Multimedia</Old>
|
||||||
|
<New>Play/Multimedia</New>
|
||||||
|
</Move>
|
||||||
|
<Move>
|
||||||
|
<Old>Office</Old>
|
||||||
|
<New>Work/Office</New>
|
||||||
|
</Move>
|
||||||
|
<Move>
|
||||||
|
<Old>System</Old>
|
||||||
|
<New>Settings</New>
|
||||||
|
</Move>
|
||||||
|
|
||||||
|
<Move>
|
||||||
|
<Old>wine-wine</Old>
|
||||||
|
<New>Work/wine-wine</New>
|
||||||
|
</Move>
|
||||||
|
</Menu>
|
||||||
|
|
||||||
89
usr/bin/startlubuntu-lxgames
Normal file
89
usr/bin/startlubuntu-lxgames
Normal file
@ -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
|
||||||
7
usr/share/xsessions/lxgames.desktop
Normal file
7
usr/share/xsessions/lxgames.desktop
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
# The names/descriptions should really be better
|
||||||
|
Name=LX Games
|
||||||
|
Comment=LX Games - A collection of games, using LXDE desktop.
|
||||||
|
Exec=/usr/bin/startlubuntu-lxgames
|
||||||
|
# Icon=
|
||||||
|
Type=Application
|
||||||
Loading…
x
Reference in New Issue
Block a user