Hello community, here is the log from the commit of package lxde-common-branding-openSUSE for openSUSE:Factory checked in at Sat Dec 26 13:38:07 CET 2009. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxde-common-branding-openSUSE/lxde-common-branding-openSUSE.changes 2009-12-16 01:32:44.000000000 +0100 @@ -0,0 +1,27 @@ +------------------------------------------------------------------- +Wed Dec 16 00:31:43 UTC 2009 - andrea@opensuse.org + +- openSUSE 11.2 Branding complete + +------------------------------------------------------------------- +Tue Dec 15 22:03:18 UTC 2009 - andrea@opensuse.org + +- changed some openbox keyboard shortcuts to make + user life easier + +------------------------------------------------------------------- +Fri Dec 11 08:27:12 UTC 2009 - andrea@opensuse.org + +- branding rebuilt on new lxde-common package + +------------------------------------------------------------------- +Wed Dec 9 23:28:16 UTC 2009 - andrea@opensuse.org + +- removed battery applet, it make the panel crash +- removed volume applt, use gmixer now (much more powerful) + +------------------------------------------------------------------- +Fri Jul 17 17:51:38 CEST 2009 - andrea@opensuse.org + +- new package + calling whatdependson for head-i586 New: ---- lxde-common-0.4-openbox-menu.patch lxde-common-0.5.0.tar.bz2 lxde-common-branding-openSUSE.changes lxde-common-branding-openSUSE.spec lxde-common-lxpanel.diff lxde-common-openbox-shortcut.patch lxde-common-startlxde.diff lxde-logout.patch pcmanfm-default.diff suse-logout.png suse.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxde-common-branding-openSUSE.spec ++++++ # # spec file for package lxde-common-branding-openSUSE (Version 11.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: lxde-common-branding-openSUSE Version: 11.2 Release: 1 License: GPL Source0: lxde-common-0.5.0.tar.bz2 Source1: suse.png Source2: suse-logout.png Patch0: lxde-common-startlxde.diff Patch1: lxde-common-lxpanel.diff Patch2: pcmanfm-default.diff Patch3: lxde-logout.patch Patch4: lxde-common-0.4-openbox-menu.patch Patch5: lxde-common-openbox-shortcut.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake gtk2-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils docbook-xsl-stylesheets fdupes libxslt Group: System/GUI/Other Summary: OpenSUSE branding BuildArch: noarch Provides: lxde-common-branding = %{version} Conflicts: otherproviders(lxde-common-branding) Supplements: packageand(lxde-common:branding-openSUSE) Requires: desktop-data-openSUSE %description This branding-style package sets openSUSE style improvments into LXDE. You should always prefer branding-openSUSE packages to branding-upstream. %prep %setup -q -n lxde-common-0.5.0 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" # keep enable-man even if not needed or make will fail %configure --enable-man %__make %{?jobs:-j%{jobs}} %install %makeinstall mkdir -p %buildroot/usr/share/applications install -c -m 644 lxde-logout.desktop %buildroot/%_datadir/applications/lxde-logout.desktop %__cp %SOURCE1 %buildroot/%_datadir/lxde/images/ %__cp %SOURCE2 %buildroot/%_datadir/lxde/images/ #delete not branding files %__rm -rf %buildroot/%_datadir/applications %__rm -rf %buildroot/%_datadir/xsessions %fdupes -s %{buildroot} %clean rm -rf %buildroot %files %defattr(-,root,root) %_bindir/lxde-logout %dir %_datadir/lxde/pcmanfm %_datadir/lxde/pcmanfm/main.lxde %dir %_datadir/lxde/openbox %_datadir/lxde/openbox/*.xml %dir %_datadir/lxpanel %dir %_datadir/lxpanel/profile %dir %_datadir/lxpanel/profile/LXDE %_datadir/lxpanel/profile/LXDE/config %dir %_datadir/lxpanel/profile/LXDE/panels %_datadir/lxpanel/profile/LXDE/panels/panel %dir %_datadir/lxde %dir %_datadir/lxde/images %_datadir/lxde/images/logout-banner.png %_datadir/lxde/images/lxde-icon.png %_datadir/lxde/images/suse-logout.png %_datadir/lxde/images/suse.png %dir %_sysconfdir/xdg/lxsession %dir %_sysconfdir/xdg/lxsession/LXDE %config %_sysconfdir/xdg/lxsession/LXDE/autostart %config %_sysconfdir/xdg/lxsession/LXDE/desktop.conf #exclude non branding files %exclude %_bindir/openbox-lxde %exclude %_bindir/startlxde %exclude %_datadir/lxde/wallpapers %exclude %_datadir/lxde/wallpapers/*.jpg %exclude %_datadir/man/man1/* %changelog ++++++ lxde-common-0.4-openbox-menu.patch ++++++ diff -uNr old-lxde-common/openbox/menu.xml lxde-common/openbox/menu.xml --- old-lxde-common/openbox/menu.xml 2009-07-15 17:10:46.000000000 +0200 +++ lxde-common/openbox/menu.xml 2009-09-13 18:00:35.000000000 +0200 @@ -8,8 +8,8 @@ <startupnotify><enabled>yes</enabled><icon>pcmanfm</icon></startupnotify> <command>pcmanfm</command></action> </item> - <item label="Xterm"> - <action name="Execute"><command>xterm</command></action> + <item label="LXterminal"> + <action name="Execute"><command>lxterminal</command></action> </item> <item label="Firefox"> <action name="Execute"><command>firefox</command></action> @@ -34,6 +34,18 @@ <command>obconf</command> </action> </item> + <item label="Run Command"> + <action name="Execute"> + <startupnotify><enabled>yes</enabled><icon>gtk-run</icon></startupnotify> + <command>lxpanelctl run</command> + </action> + </item> + <item label="Find Files"> + <action name="Execute"> + <startupnotify><enabled>yes</enabled><icon>gtk-find</icon></startupnotify> + <command>pcmanfm -f</command> + </action> + </item> <item label="Reload Config Files"> <action name="Reconfigure" /> </item> ++++++ lxde-common-lxpanel.diff ++++++ diff -uNr old-lxde-common//lxpanel/config lxde-common/lxpanel/config --- old-lxde-common//lxpanel/config 2009-12-10 00:26:03.332013906 +0100 +++ lxde-common/lxpanel/config 2009-12-10 00:26:21.421012342 +0100 @@ -1,4 +1,4 @@ [Command] FileManager=pcmanfm %s -Terminal=xterm -e +Terminal=lxterminal -e Logout=lxde-logout diff -uNr old-lxde-common//lxpanel/panel.in lxde-common/lxpanel/panel.in --- old-lxde-common//lxpanel/panel.in 2009-12-10 00:26:03.332013906 +0100 +++ lxde-common/lxpanel/panel.in 2009-12-10 00:27:35.292095457 +0100 @@ -29,7 +29,7 @@ Plugin { type = menu Config { - image=@prefix@/share/lxde/images/lxde-icon.png + image=@prefix@/share/lxde/images/suse.png system { } separator { @@ -53,7 +53,7 @@ id=pcmanfm.desktop } Button { - id=firefox.desktop + id=MozillaFirefox.desktop } } } @@ -114,10 +114,6 @@ } Plugin { - type = cpu -} - -Plugin { type = tray } ++++++ lxde-common-openbox-shortcut.patch ++++++ diff -uNr old-lxde-common-0.5.0//openbox/rc.xml.in lxde-common-0.5.0/openbox/rc.xml.in --- old-lxde-common-0.5.0//openbox/rc.xml.in 2008-04-26 04:32:26.000000000 +0200 +++ lxde-common-0.5.0/openbox/rc.xml.in 2009-12-15 23:00:53.413897622 +0100 @@ -271,12 +271,19 @@ </action> </keybind> - <keybind key="C-Escape"> + <keybind key="C-A-Escape"> <action name="Execute"> - <command>lxpanelctl menu</command> + <command>xkill</command> </action> </keybind> + <keybind key="Super_L"> + <action name="Execute"> + <command>lxpanelctl menu</command> + </action> + </keybind> + + <keybind key="F11"> <action name="ToggleFullscreen"/> </keybind> ++++++ lxde-common-startlxde.diff ++++++ diff -uNr old-lxde-common-0.5.0//startlxde.in lxde-common-0.5.0/startlxde.in --- old-lxde-common-0.5.0//startlxde.in 2009-09-04 11:46:53.000000000 +0200 +++ lxde-common-0.5.0/startlxde.in 2009-12-11 09:46:29.034256044 +0100 @@ -21,8 +21,20 @@ # 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 that LXDE default settings are loaded +LXDE_CONF_DIR="$XDG_CONFIG_HOME/lxde" +if [ ! -f "$LXDE_CONF_DIR/desktop.conf" ]; then + mkdir -p "$LXDE_CONF_DIR" + cp /etc/xdg/lxsession/LXDE/desktop.conf "$LXDE_CONF_DIR/desktop.conf" +fi + +# Ensure the ~/Desktop folder exist +if [ ! -f "$HOME/Desktop" ]; then + mkdir -p "$HOME/Desktop" +fi + # Enable GTK+2 integration for OpenOffice.org, if available. export SAL_USE_VCLPLUGIN=gtk # Start the LXDE session -exec @prefix@/bin/lxsession -s LXDE +exec @prefix@/bin/lxsession -s LXDE -e LXDE ++++++ lxde-logout.patch ++++++ diff -uNr old-lxde-common/lxde-logout.in lxde-common/lxde-logout.in --- old-lxde-common/lxde-logout.in 2009-07-15 17:10:58.000000000 +0200 +++ lxde-common/lxde-logout.in 2009-07-17 16:48:51.000000000 +0200 @@ -1,2 +1,2 @@ #!/bin/sh -lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top +lxsession-logout --banner "@prefix@/share/lxde/images/suse-logout.png" --side=top ++++++ pcmanfm-default.diff ++++++ diff -uNr old-lxde-common-0.4.1/pcmanfm/main.lxde.in lxde-common-0.4.1/pcmanfm/main.lxde.in --- old-lxde-common-0.4.1/pcmanfm/main.lxde.in 2009-04-14 19:33:44.000000000 +0200 +++ lxde-common-0.4.1/pcmanfm/main.lxde.in 2009-05-30 16:15:44.000000000 +0200 @@ -1,3 +1,6 @@ +[General] +terminal=lxterminal + [Desktop] show_wallpaper=1 -wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg +wallpaper=@prefix@/share/wallpapers/default-1920x1200.jpg ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org