Mailinglist Archive: opensuse-commit (1093 mails)

< Previous

Hello community,

here is the log from the commit of package lxde-common-branding-openSUSE for
openSUSE:Factory
checked in at Mon Mar 1 18:02:40 CET 2010.

--------
--- lxde-common-branding-openSUSE/lxde-common-branding-openSUSE.changes
2010-02-11 10:52:35.000000000 +0100
+++
/mounts/work_src_done/STABLE/lxde-common-branding-openSUSE/lxde-common-branding-openSUSE.changes
2010-03-01 12:51:33.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Mar 1 11:50:42 UTC 2010 - andrea@xxxxxxxxxxxx
+
+- added lxde-common-0.5.0-pcmanfm2.patch to switch to pcmanfm2
+- moved pcmanfm-default.diff to
+ lxde-common-0.5.0-pcmanfm-default.patch
+- bump version to 11.3
+
+-------------------------------------------------------------------

calling whatdependson for head-i586

Old:
----
pcmanfm-default.diff

New:
----
lxde-common-0.5.0-pcmanfm-default.patch
lxde-common-0.5.0-pcmanfm2.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lxde-common-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.xZAMCQ/_old 2010-03-01 18:02:32.000000000 +0100
+++ /var/tmp/diff_new_pack.xZAMCQ/_new 2010-03-01 18:02:32.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package lxde-common-branding-openSUSE (Version 11.2)
+# spec file for package lxde-common-branding-openSUSE (Version 11.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,18 +19,19 @@

Name: lxde-common-branding-openSUSE
-Version: 11.2
-Release: 3
+Version: 11.3
+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
+Patch2: lxde-common-0.5.0-pcmanfm2.patch
Patch3: lxde-logout.patch
Patch4: lxde-common-0.4-openbox-menu.patch
Patch5: lxde-common-openbox-shortcut.patch
+Patch6: lxde-common-0.5.0-pcmanfm-default.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
@@ -54,6 +55,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1

%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -80,7 +82,7 @@
%defattr(-,root,root)
%_bindir/lxde-logout
%dir %_datadir/lxde/pcmanfm
-%_datadir/lxde/pcmanfm/main.lxde
+%_datadir/lxde/pcmanfm/pcmanfm.conf
%dir %_datadir/lxde/openbox
%_datadir/lxde/openbox/*.xml
%dir %_datadir/lxpanel

++++++ lxde-common-0.5.0-pcmanfm-default.patch ++++++
diff -uNr old-lxde-common-0.5.0//pcmanfm/pcmanfm.conf.in
lxde-common-0.5.0/pcmanfm/pcmanfm.conf.in
--- old-lxde-common-0.5.0//pcmanfm/pcmanfm.conf.in 2010-03-01
12:49:07.024002587 +0100
+++ lxde-common-0.5.0/pcmanfm/pcmanfm.conf.in 2010-03-01 12:44:49.765003164
+0100
@@ -4,7 +4,7 @@

[desktop]
wallpaper_mode=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+wallpaper=/@prefix@/share/wallpapers/default-1920x1200.jpg
desktop_bg=#000000
desktop_fg=#ffffff
desktop_shadow=#000000
++++++ lxde-common-0.5.0-pcmanfm2.patch ++++++
diff -uNr old-lxde-common-0.5.0//autostart lxde-common-0.5.0/autostart
--- old-lxde-common-0.5.0//autostart 2009-07-14 13:39:53.000000000 +0200
+++ lxde-common-0.5.0/autostart 2010-03-01 12:27:34.375252635 +0100
@@ -1,3 +1,3 @@
@xscreensaver -no-splash
@lxpanel --profile LXDE
-@pcmanfm -d
+@pcmanfm --desktop
diff -uNr old-lxde-common-0.5.0//configure lxde-common-0.5.0/configure
--- old-lxde-common-0.5.0//configure 2009-12-10 18:22:09.000000000 +0100
+++ lxde-common-0.5.0/configure 2010-03-01 12:36:00.693000757 +0100
@@ -2385,7 +2385,7 @@
fi

-ac_config_files="$ac_config_files Makefile startlxde lxde-logout LXDE.desktop
lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde pcmanfm/main.lxde
man/Makefile"
+ac_config_files="$ac_config_files Makefile startlxde lxde-logout LXDE.desktop
lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde
pcmanfm/pcmanfm.conf man/Makefile"

cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3097,7 +3097,7 @@
"lxpanel/panel") CONFIG_FILES="$CONFIG_FILES lxpanel/panel" ;;
"openbox/rc.xml") CONFIG_FILES="$CONFIG_FILES openbox/rc.xml" ;;
"openbox-lxde") CONFIG_FILES="$CONFIG_FILES openbox-lxde" ;;
- "pcmanfm/main.lxde") CONFIG_FILES="$CONFIG_FILES pcmanfm/main.lxde" ;;
+ "pcmanfm/pcmanfm.conf") CONFIG_FILES="$CONFIG_FILES pcmanfm/pcmanfm.conf"
;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;

*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff -uNr old-lxde-common-0.5.0//configure.ac lxde-common-0.5.0/configure.ac
--- old-lxde-common-0.5.0//configure.ac 2009-12-10 18:22:05.000000000 +0100
+++ lxde-common-0.5.0/configure.ac 2010-03-01 12:35:09.761002895 +0100
@@ -48,7 +48,7 @@
lxpanel/panel
openbox/rc.xml
openbox-lxde
- pcmanfm/main.lxde
+ pcmanfm/pcmanfm.conf
man/Makefile
])

diff -uNr old-lxde-common-0.5.0//Makefile.am lxde-common-0.5.0/Makefile.am
--- old-lxde-common-0.5.0//Makefile.am 2009-12-08 14:32:41.000000000 +0100
+++ lxde-common-0.5.0/Makefile.am 2010-03-01 12:25:18.802253362 +0100
@@ -33,7 +33,7 @@

pcmanfmdir=$(datadir)/lxde/pcmanfm
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 -uNr old-lxde-common-0.5.0//Makefile.in lxde-common-0.5.0/Makefile.in
--- old-lxde-common-0.5.0//Makefile.in 2009-12-10 18:22:09.000000000 +0100
+++ lxde-common-0.5.0/Makefile.in 2010-03-01 12:25:18.804252569 +0100
@@ -40,7 +40,7 @@
$(srcdir)/openbox-lxde.in $(srcdir)/startlxde.in \
$(top_srcdir)/configure $(top_srcdir)/lxpanel/panel.in \
$(top_srcdir)/openbox/rc.xml.in \
- $(top_srcdir)/pcmanfm/main.lxde.in AUTHORS COPYING ChangeLog \
+ $(top_srcdir)/pcmanfm/pcmanfm.conf.in AUTHORS COPYING ChangeLog \
INSTALL NEWS compile depcomp install-sh missing mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -52,7 +52,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = startlxde lxde-logout LXDE.desktop \
lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde \
- pcmanfm/main.lxde
+ pcmanfm/pcmanfm.conf
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -244,7 +244,7 @@

pcmanfmdir = $(datadir)/lxde/pcmanfm
pcmanfm_DATA = \
- pcmanfm/main.lxde
+ pcmanfm/pcmanfm.conf

EXTRA_DIST = \
autostart \
@@ -256,7 +256,7 @@
openbox/rc.xml.in \
openbox/menu.xml \
openbox-lxde.in \
- pcmanfm/main.lxde.in \
+ pcmanfm/pcmanfm.conf.in \
$(lxpanel_DATA) \
lxpanel/panel.in

@@ -312,7 +312,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
openbox-lxde: $(top_builddir)/config.status $(srcdir)/openbox-lxde.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-pcmanfm/main.lxde: $(top_builddir)/config.status
$(top_srcdir)/pcmanfm/main.lxde.in
+pcmanfm/pcmanfm.conf: $(top_builddir)/config.status
$(top_srcdir)/pcmanfm/pcmanfm.conf.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
diff -uNr old-lxde-common-0.5.0//pcmanfm/main.lxde.in
lxde-common-0.5.0/pcmanfm/main.lxde.in
--- old-lxde-common-0.5.0//pcmanfm/main.lxde.in 2008-04-20 10:24:58.000000000
+0200
+++ lxde-common-0.5.0/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 -uNr old-lxde-common-0.5.0//pcmanfm/pcmanfm.conf.in
lxde-common-0.5.0/pcmanfm/pcmanfm.conf.in
--- old-lxde-common-0.5.0//pcmanfm/pcmanfm.conf.in 1970-01-01
01:00:00.000000000 +0100
+++ lxde-common-0.5.0/pcmanfm/pcmanfm.conf.in 2010-03-01 12:25:18.805252627
+0100
@@ -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
++++++ lxde-common-startlxde.diff ++++++
--- /var/tmp/diff_new_pack.xZAMCQ/_old 2010-03-01 18:02:32.000000000 +0100
+++ /var/tmp/diff_new_pack.xZAMCQ/_new 2010-03-01 18:02:32.000000000 +0100
@@ -1,6 +1,18 @@
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 2010-02-09 17:39:17.846514864 +0100
++++ lxde-common-0.5.0/startlxde.in 2010-03-01 12:20:16.771002969 +0100
+@@ -6,9 +6,9 @@
+
+ # Ensure the existance of pcmanfm config file
+ PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
+-if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
++if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
+ mkdir -p "$PCMANFM_CONF_DIR"
+- cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
++ cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf
"$PCMANFM_CONF_DIR/pcmanfm.conf"
+ fi
+
+ # Ensure the existance of openbox config file
@@ -21,8 +21,28 @@
# 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
@@ -25,7 +37,7 @@

+# 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)"
++ eval "$(dbus-launch --sh-syntax --exit-with-session)"
+fi
+
# Start the LXDE session

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1093 mails)

commit lxde-common-branding-openSUSE for openSUSE:Factory

Search this list

List Navigation

This Thread