Hello community, here is the log from the commit of package xfce4-session for openSUSE:12.3 checked in at 2013-03-04 17:35:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/xfce4-session (Old) and /work/SRC/openSUSE:12.3/.xfce4-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-session", Maintainer is "xfce-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.3/xfce4-session/xfce4-session.changes 2013-01-31 01:45:52.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.xfce4-session.new/xfce4-session.changes 2013-03-04 17:35:27.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 26 06:56:50 UTC 2013 - gber@opensuse.org + +- removed systemd workaround in + xfce4-session-adapt-session-scripts.patch now that + xfce4-power-manager is patched + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-session-adapt-session-scripts.patch ++++++ --- /var/tmp/diff_new_pack.ifWV5q/_old 2013-03-04 17:35:27.000000000 +0100 +++ /var/tmp/diff_new_pack.ifWV5q/_new 2013-03-04 17:35:27.000000000 +0100 @@ -15,14 +15,13 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs" -@@ -81,112 +75,19 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap -# run xfce4-session if installed -if which xfce4-session >/dev/null 2>&1; then -+test -x /usr/bin/systemd-inhibit && SYSTEMD_INHIBIT_CMD="systemd-inhibit --what=idle:handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch " - +- - # check if we start xfce4-session with ck-launch-session. this is only - # required for starting from a console, not a login manager - if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then @@ -43,7 +42,7 @@ +# check if we start xfce4-session with ck-launch-session. this is only +# required for starting from a console, not a login manager +if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then -+ if ! ck-launch-session $SYSTEMD_INHIBIT_CMD xfce4-session; then ++ if ! ck-launch-session xfce4-session; then + cat >&2 <<'EOF' +Failed to start Xfce with consolekit support. +Aborted startup... @@ -52,7 +51,10 @@ fi - - exit 0 --fi ++else ++ # start xfce4-session normally ++ xfce4-session + fi - -################## -# IMPORTANT NOTE # @@ -106,10 +108,7 @@ - $cmd & - fi - done -+else -+ # start xfce4-session normally -+ $SYSTEMD_INHIBIT_CMD xfce4-session - fi +-fi - -xfdesktop& -orage & @@ -158,14 +157,13 @@ # Modify libglade and glade environment variables so that # it will find the files installed by Xfce GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@" -@@ -81,112 +75,19 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +75,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap -# run xfce4-session if installed -if which xfce4-session >/dev/null 2>&1; then -+test -x /usr/bin/systemd-inhibit && SYSTEMD_INHIBIT_CMD="systemd-inhibit --what=idle:handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch " - +- - # check if we start xfce4-session with ck-launch-session. this is only - # required for starting from a console, not a login manager - if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then @@ -186,7 +184,7 @@ +# check if we start xfce4-session with ck-launch-session. this is only +# required for starting from a console, not a login manager +if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then -+ if ! ck-launch-session $SYSTEMD_INHIBIT_CMD xfce4-session; then ++ if ! ck-launch-session xfce4-session; then + cat >&2 <<'EOF' +Failed to start Xfce with consolekit support. +Aborted startup... @@ -195,7 +193,10 @@ fi - - exit 0 --fi ++else ++ # start xfce4-session normally ++ xfce4-session + fi - -################## -# IMPORTANT NOTE # @@ -249,10 +250,7 @@ - $cmd & - fi - done -+else -+ # start xfce4-session normally -+ $SYSTEMD_INHIBIT_CMD xfce4-session - fi +-fi - -xfdesktop& -orage & -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org