Hello community, here is the log from the commit of package lxdm for openSUSE:Factory checked in at Mon Jul 25 10:11:26 CEST 2011.
-------- --- lxdm/lxdm.changes 2010-09-30 13:01:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxdm/lxdm.changes 2011-07-21 16:45:37.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jul 21 14:40:20 UTC 2011 - [email protected] + +- new upstream version 0.4.0 + * added lxdm-config + * added gtk3 support + * many improvments +- rebased all patches +- removed lxdm-conf recommendation since a config tool + is provided by lxdm itself + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lxdm-0.2.0-background.patch lxdm-0.2.0-common.patch lxdm-0.3.0-gnome-start.patch lxdm-0.3.0.tar.bz2 lxdm-0.3.0-use-sysconfig.patch New: ---- lxdm-0.4.0-background.patch lxdm-0.4.0-common.patch lxdm-0.4.0-gnome-start.patch lxdm-0.4.0.tar.bz2 lxdm-0.4.0-use-sysconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxdm.spec ++++++ --- /var/tmp/diff_new_pack.nUmLNw/_old 2011-07-25 10:09:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nUmLNw/_new 2011-07-25 10:09:54.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package lxdm (Version 0.3.0) +# spec file for package lxdm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -20,7 +20,7 @@ Name: lxdm Summary: LXDE Display Manager -Version: 0.3.0 +Version: 0.4.0 Release: 1 License: GPLv2 and LGPLv2 Group: System/GUI/LXDE @@ -28,21 +28,22 @@ Source0: %name-%version.tar.bz2 Source1: README.SUSE Source2: %{name}.pamd -Patch0: %{name}-0.2.0-background.patch -# PATCH-FEATURE-OPENSUSE lxdm-0.3.0-use-sysconfig.patch [email protected] +Patch0: %{name}-0.4.0-background.patch +# PATCH-FEATURE-OPENSUSE lxdm-0.4.0-use-sysconfig.patch [email protected] # this patch allow lxdm to read system settings from /etc/sysconfig -Patch1: %{name}-0.3.0-use-sysconfig.patch -Patch2: %{name}-0.3.0-gnome-start.patch -# PATCH-FIX-OPENSUSE lxdm-0.2.0-common.patch [email protected] +Patch1: %{name}-0.4.0-use-sysconfig.patch +Patch2: %{name}-0.4.0-gnome-start.patch +# PATCH-FIX-OPENSUSE lxdm-0.4.0-common.patch [email protected] # this patch fix bnc#586555 lxdm now use common scripts in /etc/X11/xdm -Patch4: %{name}-0.2.0-common.patch +Patch4: %{name}-0.4.0-common.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake gcc gettext-tools make BuildRequires: ConsoleKit-devel gettext-runtime gtk2-devel intltool BuildRequires: fdupes iso-codes-devel pam-devel pkg-config Requires: desktop-data-openSUSE Requires: pam -Recommends: lxdm-conf +Provides: lxdm-conf = %version +Obsoletes: lxdm-conf < %version %description LXDM is the future display manager of LXDE, the Lightweight X11 Desktop @@ -66,7 +67,6 @@ %makeinstall %__mkdir_p %buildroot/%_bindir %__rm %buildroot/%_sbindir/%name -%__rm -rf %buildroot/%_datadir/locale/{frp,es_VE,ur_PK} %__rm -rf %buildroot/%_sysconfdir/pam.d/%name install %SOURCE2 %buildroot/%_sysconfdir/pam.d/%name chmod -x %buildroot/%_sysconfdir/pam.d/%name @@ -100,6 +100,7 @@ %{_datadir}/%{name}/* %dir %{_sysconfdir}/%{name}/ %{_bindir}/%{name} +%{_bindir}/%{name}-config %{_sbindir}/%{name}-binary %{_libexecdir}/%{name}-greeter-gtk %{_libexecdir}/%{name}-greeter-gdk ++++++ lxdm-0.2.0-background.patch -> lxdm-0.4.0-background.patch ++++++ --- lxdm/lxdm-0.2.0-background.patch 2010-05-04 10:19:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxdm/lxdm-0.4.0-background.patch 2011-07-21 16:45:22.000000000 +0200 @@ -1,12 +1,12 @@ -diff -uNr old-lxdm//data/lxdm.conf.in lxdm/data/lxdm.conf.in ---- old-lxdm//data/lxdm.conf.in 2010-01-26 20:03:32.000000000 +0100 -+++ lxdm/data/lxdm.conf.in 2010-02-03 22:57:49.296834920 +0100 -@@ -9,7 +9,7 @@ - - [display] +diff -uNr old-lxdm-0.4.0.git.1310644223//data/lxdm.conf.in lxdm-0.4.0.git.1310644223//data/lxdm.conf.in +--- old-lxdm-0.4.0.git.1310644223//data/lxdm.conf.in 2011-07-15 15:14:21.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/lxdm.conf.in 2011-07-15 15:16:39.410044395 +0200 +@@ -27,7 +27,7 @@ gtk_theme=Clearlooks + + ## background of the greeter -bg=/usr/share/backgrounds/default.png +bg=/usr/share/wallpapers/default-1600x1200.png + + ## if show bottom pane bottom_pane=1 - lang=1 - theme=Industrial ++++++ lxdm-0.2.0-common.patch -> lxdm-0.4.0-common.patch ++++++ --- lxdm/lxdm-0.2.0-common.patch 2010-05-18 20:22:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxdm/lxdm-0.4.0-common.patch 2011-07-21 16:45:23.000000000 +0200 @@ -1,31 +1,31 @@ -diff -uNr old-lxdm//data/LoginReady.in lxdm/data/LoginReady.in ---- old-lxdm//data/LoginReady.in 2010-03-28 16:19:18.000000000 +0200 -+++ lxdm/data/LoginReady.in 2010-03-31 21:28:11.802208667 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/LoginReady.in lxdm-0.4.0.git.1310644223//data/LoginReady.in +--- old-lxdm-0.4.0.git.1310644223//data/LoginReady.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/LoginReady.in 2011-07-15 15:18:16.341044121 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xsetup && exec /etc/X11/xdm/Xsetup -diff -uNr old-lxdm//data/PostLogout.in lxdm/data/PostLogout.in ---- old-lxdm//data/PostLogout.in 2010-03-28 16:19:18.000000000 +0200 -+++ lxdm/data/PostLogout.in 2010-03-31 21:28:11.803209493 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/PostLogout.in lxdm-0.4.0.git.1310644223//data/PostLogout.in +--- old-lxdm-0.4.0.git.1310644223//data/PostLogout.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/PostLogout.in 2011-07-15 15:18:16.341044121 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xreset && exec /etc/X11/xdm/Xreset -diff -uNr old-lxdm//data/PreLogin.in lxdm/data/PreLogin.in ---- old-lxdm//data/PreLogin.in 2010-03-28 16:19:18.000000000 +0200 -+++ lxdm/data/PreLogin.in 2010-03-31 21:28:11.803209493 +0200 +diff -uNr old-lxdm-0.4.0.git.1310644223//data/PreLogin.in lxdm-0.4.0.git.1310644223//data/PreLogin.in +--- old-lxdm-0.4.0.git.1310644223//data/PreLogin.in 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/PreLogin.in 2011-07-15 15:18:16.342044142 +0200 @@ -1,3 +1,2 @@ #!/bin/sh -# -# Note: this is a sample and will not be run as is. +test -x /etc/X11/xdm/Xstartup && exec /etc/X11/xdm/Xstartup -diff -uNr old-lxdm//data/Xsession lxdm/data/Xsession ---- old-lxdm//data/Xsession 2010-03-28 16:19:18.000000000 +0200 -+++ lxdm/data/Xsession 2010-03-31 21:28:11.804180915 +0200 -@@ -1,43 +1,26 @@ +diff -uNr old-lxdm-0.4.0.git.1310644223//data/Xsession lxdm-0.4.0.git.1310644223//data/Xsession +--- old-lxdm-0.4.0.git.1310644223//data/Xsession 2011-07-15 15:17:02.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//data/Xsession 2011-07-15 15:19:16.391044441 +0200 +@@ -1,46 +1,26 @@ #!/bin/bash -# use bash for "exec -l", howto run login shell by /bin/sh ? @@ -41,12 +41,14 @@ -fi +LXSESSION=/usr/bin/startlxde +test $# -eq 1 -a -n "$1" && LXSESSION=$1 -+ + +-[ -f /etc/xprofile ] && . /etc/xprofile +-[ -f ~/.xprofile ] && . ~/.xprofile +export WINDOWMANAGER=$LXSESSION +test -x /etc/X11/xdm/Xsession && exec /etc/X11/xdm/Xsession "${LXSESSION}" +test -x /etc/X11/xinit/xinitrc && exec -l $SHELL -c /etc/X11/xinit/xinitrc --if [ -x /etc/X11/xinit/xinitrc-common ]; then +-if [ -f /etc/X11/xinit/xinitrc-common ]; then -# fedora - . /etc/X11/xinit/xinitrc-common - if ! [ -z "$XDG_SESSION_COOKIE" ]; then @@ -57,10 +59,10 @@ - exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" -elif [ -x /etc/X11/xinit/Xsession ]; then -# fedora -- exec /etc/X11/xinit/Xsession $LXSESSION +- exec /etc/X11/xinit/Xsession "$LXSESSION" -elif [ -x /etc/X11/Xsession ]; then -# mandriva, debian, ubuntu -- exec /etc/X11/Xsession $LXSESSION +- exec /etc/X11/Xsession "$LXSESSION" -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION ++++++ lxdm-0.3.0-gnome-start.patch -> lxdm-0.4.0-gnome-start.patch ++++++ --- lxdm/lxdm-0.3.0-gnome-start.patch 2010-07-08 13:03:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxdm/lxdm-0.4.0-gnome-start.patch 2011-07-21 16:45:24.000000000 +0200 @@ -1,7 +1,7 @@ -diff -urN lxdm-0.2.99_git20100706.orig/src/lxdm.c lxdm-0.2.99_git20100706/src/lxdm.c ---- lxdm-0.2.99_git20100706.orig/src/lxdm.c 2010-07-08 10:38:58.000000000 +0200 -+++ lxdm-0.2.99_git20100706/src/lxdm.c 2010-07-08 10:42:58.000000000 +0200 -@@ -1140,7 +1140,7 @@ +diff -uNr old-lxdm-0.4.0.git.1310644223//src/lxdm.c lxdm-0.4.0.git.1310644223//src/lxdm.c +--- old-lxdm-0.4.0.git.1310644223//src/lxdm.c 2011-07-15 15:14:21.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223//src/lxdm.c 2011-07-15 15:15:27.939044540 +0200 +@@ -1267,7 +1267,7 @@ if(!strcasecmp(name,"LXDE")) exec = g_strdup("startlxde"); else if( !strcasecmp(name, "GNOME") ) ++++++ lxdm-0.3.0.tar.bz2 -> lxdm-0.4.0.tar.bz2 ++++++ ++++ 14797 lines of diff (skipped) ++++++ lxdm-0.3.0-use-sysconfig.patch -> lxdm-0.4.0-use-sysconfig.patch ++++++ --- lxdm/lxdm-0.3.0-use-sysconfig.patch 2010-07-21 01:23:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxdm/lxdm-0.4.0-use-sysconfig.patch 2011-07-21 16:45:26.000000000 +0200 @@ -1,16 +1,24 @@ -diff -uNr old-lxdm//data/lxdm.conf.in lxdm/data/lxdm.conf.in ---- old-lxdm//data/lxdm.conf.in 2010-07-21 01:00:19.000000000 +0200 -+++ lxdm/data/lxdm.conf.in 2010-07-21 01:21:35.193860076 +0200 -@@ -1,6 +1,4 @@ +diff -urNp lxdm-0.4.0.git.1310644223.orig/data/lxdm.conf.in lxdm-0.4.0.git.1310644223/data/lxdm.conf.in +--- lxdm-0.4.0.git.1310644223.orig/data/lxdm.conf.in 2011-07-15 16:39:32.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223/data/lxdm.conf.in 2011-07-15 16:43:04.000000000 +0200 +@@ -1,14 +1,8 @@ [base] +-## uncomment and set autologin username to enable autologin -# autologin=dgod +- + ## uncomment and set timeout to enable timeout autologin, + ## the value should >=5 + # timeout=10 + +-## default session or desktop used when no systemwide config -# session=/usr/bin/startlxde +- + ## uncomment and set to set numlock on your keyboard # numlock=0 - greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk -diff -uNr old-lxdm//src/gdm/gdm-sysconfig.c lxdm/src/gdm/gdm-sysconfig.c ---- old-lxdm//src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm/src/gdm/gdm-sysconfig.c 2010-07-21 01:21:35.197860880 +0200 +diff -urNp lxdm-0.4.0.git.1310644223.orig/src/gdm/gdm-sysconfig.c lxdm-0.4.0.git.1310644223/src/gdm/gdm-sysconfig.c +--- lxdm-0.4.0.git.1310644223.orig/src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0.git.1310644223/src/gdm/gdm-sysconfig.c 2011-07-15 16:41:52.000000000 +0200 @@ -0,0 +1,439 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -451,9 +459,9 @@ + g_strfreev (lines); + return result; +} -diff -uNr old-lxdm//src/gdm/gdm-sysconfig.h lxdm/src/gdm/gdm-sysconfig.h ---- old-lxdm//src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm/src/gdm/gdm-sysconfig.h 2010-07-21 01:21:35.197860880 +0200 +diff -urNp lxdm-0.4.0.git.1310644223.orig/src/gdm/gdm-sysconfig.h lxdm-0.4.0.git.1310644223/src/gdm/gdm-sysconfig.h +--- lxdm-0.4.0.git.1310644223.orig/src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0.git.1310644223/src/gdm/gdm-sysconfig.h 2011-07-15 16:41:52.000000000 +0200 @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -496,10 +504,10 @@ +G_END_DECLS + +#endif /* __GDM_SYSCONFIG_H */ -diff -uNr old-lxdm//src/lxdm.c lxdm/src/lxdm.c ---- old-lxdm//src/lxdm.c 2010-07-21 01:00:19.000000000 +0200 -+++ lxdm/src/lxdm.c 2010-07-21 01:21:35.214857941 +0200 -@@ -68,6 +68,14 @@ +diff -urNp lxdm-0.4.0.git.1310644223.orig/src/lxdm.c lxdm-0.4.0.git.1310644223/src/lxdm.c +--- lxdm-0.4.0.git.1310644223.orig/src/lxdm.c 2011-07-15 16:39:32.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223/src/lxdm.c 2011-07-15 16:41:52.000000000 +0200 +@@ -72,6 +72,14 @@ #define LOGFILE "/var/log/lxdm.log" @@ -514,7 +522,7 @@ typedef struct{ gboolean idle; gboolean greeter; -@@ -1117,7 +1125,7 @@ +@@ -1209,7 +1217,7 @@ gboolean lxdm_get_session_info(char *ses char *name=NULL,*exec=NULL; if(!session || !session[0]) { @@ -523,7 +531,7 @@ if(!name && getenv("PREFERRED")) name = g_strdup(getenv("PREFERRED")); if(!session && getenv("DESKTOP")) -@@ -1340,7 +1348,7 @@ +@@ -1538,7 +1546,7 @@ int lxdm_do_auto_login(void) int i,count,ret; int success=0; @@ -532,16 +540,14 @@ if(!p) return 0; users=g_strsplit(p," ",8); g_free(p); -diff -uNr old-lxdm//src/Makefile.am lxdm/src/Makefile.am ---- old-lxdm//src/Makefile.am 2010-07-13 23:30:48.000000000 +0200 -+++ lxdm/src/Makefile.am 2010-07-21 01:21:35.218863982 +0200 -@@ -20,7 +20,8 @@ - $(NULL) +diff -urNp lxdm-0.4.0.git.1310644223.orig/src/Makefile.am lxdm-0.4.0.git.1310644223/src/Makefile.am +--- lxdm-0.4.0.git.1310644223.orig/src/Makefile.am 2011-07-15 16:39:32.000000000 +0200 ++++ lxdm-0.4.0.git.1310644223/src/Makefile.am 2011-07-15 16:44:08.000000000 +0200 +@@ -21,6 +21,7 @@ lxdm_binary_LDADD = \ lxdm_binary_SOURCES = \ -- lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h -+ lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \ + lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \ + gdm/gdm-sysconfig.c gdm/gdm-sysconfig.h \ $(NULL) - libexec_PROGRAMS = lxdm-greeter-gtk lxdm-greeter-gdk lxdm-numlock + libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
