Hello community, here is the log from the commit of package lxde-common for openSUSE:Factory checked in at Mon Aug 1 10:30:02 CEST 2011. -------- --- lxde-common/lxde-common.changes 2011-07-27 08:23:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxde-common/lxde-common.changes 2011-07-30 17:26:29.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Jul 30 10:37:12 UTC 2011 - andrea@opensuse.org + +- added lxde-common-0.5.5-fix-default-pcmanfm.patch to fix + import of default pcmanfm config file now in a different folder + +------------------------------------------------------------------- +Sat Jul 30 09:23:36 UTC 2011 - andrea@opensuse.org + +- New upstream version 0.5.5 + * full support to pcmanfm2 + * bugfixes + * full support to LXDE "profiles" +- removed lxde-common-0.5.0-pcmanfm2.patch and + lxde-common-startlxde.diff now into upstream code + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lxde-common-0.5.0-pcmanfm2.patch lxde-common-0.5.0.tar.bz2 lxde-common-startlxde.diff New: ---- lxde-common-0.5.5-fix-default-pcmanfm.patch lxde-common-0.5.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxde-common.spec ++++++ --- /var/tmp/diff_new_pack.qTOJjh/_old 2011-08-01 10:28:15.000000000 +0200 +++ /var/tmp/diff_new_pack.qTOJjh/_new 2011-08-01 10:28:15.000000000 +0200 @@ -19,16 +19,15 @@ Name: lxde-common -Version: 0.5.0 -Release: 27 +Version: 0.5.5 +Release: 1 License: GPLv2 Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 Source1: lxde-new-wallpapers.tar.bz2 Source2: lxde-lock-screen.desktop -Patch0: %name-startlxde.diff -Patch1: %name-0.5.0-pcmanfm2.patch -Patch2: %name-0.5.0-lxde.desktop.patch +Patch0: %name-0.5.0-lxde.desktop.patch +Patch1: %name-0.5.5-fix-default-pcmanfm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake intltool update-desktop-files BuildRequires: docbook-utils docbook-xsl-stylesheets fdupes libxslt @@ -64,10 +63,8 @@ %setup -q -n %name-%version %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build -autoreconf -fi %configure --enable-man %__make %{?jobs:-j%{jobs}} @@ -112,8 +109,6 @@ %files branding-upstream %defattr(-,root,root) %_bindir/lxde-logout -%dir %_datadir/lxde/pcmanfm -%_datadir/lxde/pcmanfm/pcmanfm.conf %dir %_datadir/lxde/openbox %_datadir/lxde/openbox/*.xml %dir %_datadir/lxpanel @@ -126,8 +121,11 @@ %_datadir/lxde/images/logout-banner.png %_datadir/lxde/images/lxde-icon.png %dir %_sysconfdir/xdg/lxsession +%dir %_sysconfdir/xdg/pcmanfm %dir %_sysconfdir/xdg/lxsession/LXDE +%dir %_sysconfdir/xdg/pcmanfm/LXDE %config %_sysconfdir/xdg/lxsession/LXDE/autostart %config %_sysconfdir/xdg/lxsession/LXDE/desktop.conf +%config %_sysconfdir/xdg/pcmanfm/LXDE/pcmanfm.conf %changelog ++++++ lxde-common-0.5.5-fix-default-pcmanfm.patch ++++++ diff -uNr old-lxde-common-0.5.5//startlxde.in lxde-common-0.5.5/startlxde.in --- old-lxde-common-0.5.5//startlxde.in 2011-07-29 16:04:03.000000000 +0200 +++ lxde-common-0.5.5/startlxde.in 2011-07-30 12:35:53.158518888 +0200 @@ -8,7 +8,7 @@ PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE" if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then mkdir -p "$PCMANFM_CONF_DIR" - cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" + cp @sysconfdir@/xdg/pcmanfm/LXDE/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" fi # Ensure the existance of openbox config file ++++++ lxde-common-0.5.0.tar.bz2 -> lxde-common-0.5.5.tar.bz2 ++++++ ++++ 2903 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/Makefile.am new/lxde-common-0.5.5/Makefile.am --- old/lxde-common-0.5.0/Makefile.am 2009-12-08 14:32:41.000000000 +0100 +++ new/lxde-common-0.5.5/Makefile.am 2011-07-29 16:04:03.000000000 +0200 @@ -31,9 +31,9 @@ openbox/rc.xml \ openbox/menu.xml -pcmanfmdir=$(datadir)/lxde/pcmanfm +pcmanfmdir=$(sysconfdir)/xdg/pcmanfm/LXDE pcmanfm_DATA= \ - pcmanfm/main.lxde + pcmanfm/pcmanfm.conf EXTRA_DIST = \ autostart \ @@ -45,7 +45,7 @@ openbox/rc.xml.in \ openbox/menu.xml \ openbox-lxde.in \ - pcmanfm/main.lxde.in \ + pcmanfm/pcmanfm.conf.in \ $(lxpanel_DATA) \ lxpanel/panel.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/autostart new/lxde-common-0.5.5/autostart --- old/lxde-common-0.5.0/autostart 2009-07-14 13:39:53.000000000 +0200 +++ new/lxde-common-0.5.5/autostart 2011-07-29 16:04:03.000000000 +0200 @@ -1,3 +1,3 @@ -@xscreensaver -no-splash @lxpanel --profile LXDE -@pcmanfm -d +@pcmanfm --desktop --profile LXDE +@xscreensaver -no-splash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/compile new/lxde-common-0.5.5/compile --- old/lxde-common-0.5.0/compile 2008-04-20 11:28:33.000000000 +0200 +++ new/lxde-common-0.5.5/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey@cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -case $1 in - '') - echo "$0: No command. Try `$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/configure.ac new/lxde-common-0.5.5/configure.ac --- old/lxde-common-0.5.0/configure.ac 2009-12-10 18:22:05.000000000 +0100 +++ new/lxde-common-0.5.5/configure.ac 2011-07-29 16:04:03.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT(lxde-common,[0.5.0], [],lxde-common) +AC_INIT(lxde-common,[0.5.5], [],lxde-common) AM_INIT_AUTOMAKE() dnl AC_PROG_INTLTOOL(, [no-xml]) dnl AM_MAINTAINER_MODE @@ -48,7 +48,16 @@ lxpanel/panel openbox/rc.xml openbox-lxde - pcmanfm/main.lxde + pcmanfm/pcmanfm.conf man/Makefile ]) +if test x"$sysconfdir" != x'/etc'; then + echo + echo + echo 'Error: sysconfdir is not /etc.' + echo 'Please consider passing --sysconfdir=/etc to configure.'; + echo 'Otherwise default config files will be installed to wrong place.' + echo + echo +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/lxpanel/config new/lxde-common-0.5.5/lxpanel/config --- old/lxde-common-0.5.0/lxpanel/config 2008-06-16 10:10:24.000000000 +0200 +++ new/lxde-common-0.5.5/lxpanel/config 2011-07-29 16:04:03.000000000 +0200 @@ -1,4 +1,4 @@ [Command] FileManager=pcmanfm %s -Terminal=xterm -e +Terminal=lxterminal Logout=lxde-logout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/man/openbox-lxde.1 new/lxde-common-0.5.5/man/openbox-lxde.1 --- old/lxde-common-0.5.0/man/openbox-lxde.1 2008-04-26 04:29:45.000000000 +0200 +++ new/lxde-common-0.5.5/man/openbox-lxde.1 2011-07-29 16:04:03.000000000 +0200 @@ -1,32 +1,60 @@ -.TH "OPENBOX-LXDE" "1" -.SH "NAME" -openbox-lxde (em wrapper to run openbox for LXDE -.SH "SYNOPSIS" -.PP -\fBopenbox-lxde\fR -.SH "DESCRIPTION" -.PP -This manual page documents briefly the -\fBopenbox-lxde\fR command. -.PP -\fBopenbox-lxde\fR is a wrapper script which -runs openbox with LXDE specific config file. - -.SH "AUTHOR" -.PP -This manual page was written by paulliu grandpaul@gmail.com for -the \fBDebian\fP system (but may be used by others). Permission is -granted to copy, distribute and/or modify this document under -the terms of the GNU General Public License, Version 2 any -later version published by the Free Software Foundation. - -.PP -On Debian systems, the complete text of the GNU General Public -License can be found in /usr/share/common-licenses/GPL. - -.PP -The source code of this manual page should be in -\fB.sgml\fP format. It is better not to modify -the \fB.1\fP file directly. - -." created by instant / docbook-to-man, Sat 26 Apr 2008, 10:29 +'" t +." Title: OPENBOX-LXDE +." Author: Ying-Chun Liu +." Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/ +." Date: April 20, 2008 +." Manual: http://LXDE.org +." Source: http://LXDE.org +." Language: English +." +.TH "OPENBOX-LXDE" "1" "April 20, 2008" "http://LXDE\&.org" "http://LXDE.org" +." ----------------------------------------------------------------- +." * set default formatting +." ----------------------------------------------------------------- +." disable hyphenation +.nh +." disable justification (adjust text to left margin only) +.ad l +." ----------------------------------------------------------------- +." * MAIN CONTENT STARTS HERE * +." ----------------------------------------------------------------- +.SH "NAME" +openbox-lxde - wrapper to run openbox for LXDE +.SH "SYNOPSIS" +.HP \w'\fBopenbox-lxde\fR\ 'u +\fBopenbox-lxde\fR +.SH "DESCRIPTION" +.PP +This manual page documents briefly the +\fBopenbox-lxde\fR +command&. +.PP +\fBopenbox-lxde\fR +is a wrapper script which runs openbox with LXDE specific config file&. +.SH "AUTHOR" +.PP +This manual page was written by paulliu +grandpaul@gmail&.com +for the +Debian +system (but may be used by others)&. Permission is granted to copy, distribute and/or modify this document under the terms of the +GNU +General Public License, Version 2 any later version published by the Free Software Foundation&. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL&. +.PP +The source code of this manual page should be in +&.sgml +format&. It is better not to modify the +&.1 +file directly&. +.SH "AUTHOR" +.PP +\fBYing-Chun Liu\fR +.RS 4 +Author. +.RE +.SH "COPYRIGHT" +.br +Copyright (co 2008 paulliu +.br diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/missing new/lxde-common-0.5.5/missing --- old/lxde-common-0.5.0/missing 2008-04-20 11:28:33.000000000 +0200 +++ new/lxde-common-0.5.5/missing 2011-07-29 16:12:19.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create `y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: `tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: `$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/openbox/menu.xml new/lxde-common-0.5.5/openbox/menu.xml --- old/lxde-common-0.5.0/openbox/menu.xml 2008-07-16 04:20:32.000000000 +0200 +++ new/lxde-common-0.5.5/openbox/menu.xml 2011-07-29 16:04:03.000000000 +0200 @@ -25,7 +25,7 @@ <item label="Desktop Settings"> <action name="Execute"> <startupnotify><enabled>yes</enabled></startupnotify> - <command>pcmanfm --show-pref 2</command> + <command>pcmanfm --desktop-pref</command> </action> </item> <item label="Window Management Settings"> @@ -43,4 +43,4 @@ </item> </menu> -</openbox_menu> \ No newline at end of file +</openbox_menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/pcmanfm/main.lxde.in new/lxde-common-0.5.5/pcmanfm/main.lxde.in --- old/lxde-common-0.5.0/pcmanfm/main.lxde.in 2008-04-20 10:24:58.000000000 +0200 +++ new/lxde-common-0.5.5/pcmanfm/main.lxde.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -[Desktop] -show_wallpaper=1 -wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/pcmanfm/pcmanfm.conf.in new/lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in --- old/lxde-common-0.5.0/pcmanfm/pcmanfm.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in 2011-07-29 16:04:03.000000000 +0200 @@ -0,0 +1,20 @@ +[config] +bm_open_method=0 +su_cmd=xdg-su -c '%s' + +[desktop] +wallpaper_mode=1 +wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg +desktop_bg=#000000 +desktop_fg=#ffffff +desktop_shadow=#000000 + +[ui] +always_show_tabs=0 +hide_close_btn=0 +win_width=640 +win_height=480 +view_mode=0 +show_hidden=0 +sort_type=0 +sort_by=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/lxde-common-0.5.0/startlxde.in new/lxde-common-0.5.5/startlxde.in --- old/lxde-common-0.5.0/startlxde.in 2009-09-04 11:46:53.000000000 +0200 +++ new/lxde-common-0.5.5/startlxde.in 2011-07-29 16:04:03.000000000 +0200 @@ -1,28 +1,43 @@ #!/bin/sh if [ -z "$XDG_CONFIG_HOME" ]; then - export XDG_CONFIG_HOME="$HOME/.config" + export XDG_CONFIG_HOME="$HOME/.config" fi # Ensure the existance of pcmanfm config file -PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm" -if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then - mkdir -p "$PCMANFM_CONF_DIR" - cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde" +PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE" +if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then + mkdir -p "$PCMANFM_CONF_DIR" + cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" fi # Ensure the existance of openbox config file OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then - mkdir -p "$OPENBOX_CONF_DIR" - cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml" + mkdir -p "$OPENBOX_CONF_DIR" + cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml" fi +# Ensure the existance of the 'Desktop' folder +if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then + . "$XDG_CONFIG_HOME/user-dirs.dirs" +else + XDG_DESKTOP_DIR="$HOME/Desktop" +fi +mkdir -p "$XDG_DESKTOP_DIR" + # 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 # 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 XDG_MENU_PREFIX="lxde-" + # Start the LXDE session -exec @prefix@/bin/lxsession -s LXDE +exec @prefix@/bin/lxsession -s LXDE -e LXDE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org