Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2014-10-20 07:27:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-session" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2013-10-11 11:05:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 2014-10-20 07:27:14.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Oct 19 08:27:57 UTC 2014 - g...@opensuse.org + +- add xfce4-session-set-desktop-name.patch.changes in order to set + the DesktopName property in the xsession file (bxo#11239) + +------------------------------------------------------------------- +Sun Oct 19 08:17:58 UTC 2014 - g...@opensuse.org + +- modify xfce4-session-adapt-session-scripts.patch to set + XDG_CURRENT_DESKTOP (bxo#11239) + +------------------------------------------------------------------- New: ---- xfce4-session-set-desktop-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-session.spec ++++++ --- /var/tmp/diff_new_pack.9h6trv/_old 2014-10-20 07:27:15.000000000 +0200 +++ /var/tmp/diff_new_pack.9h6trv/_new 2014-10-20 07:27:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -32,6 +32,8 @@ Patch1: xfce4-session-adapt-session-scripts.patch # PATCH-FIX-UPSTREAM xfce4-session-systemd-suspend-hibernate-support.patch bnc#9952 g...@opensuse.org -- Add systemd suspend/hibernate support Patch2: xfce4-session-systemd-suspend-hibernate-support.patch +# PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 g...@opensuse.org -- Set DesktopName property in the xsession file +Patch3: xfce4-session-set-desktop-name.patch BuildRequires: iceauth BuildRequires: intltool BuildRequires: update-desktop-files @@ -120,6 +122,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build xdt-autogen ++++++ xfce4-session-adapt-session-scripts.patch ++++++ --- /var/tmp/diff_new_pack.9h6trv/_old 2014-10-20 07:27:15.000000000 +0200 +++ /var/tmp/diff_new_pack.9h6trv/_new 2014-10-20 07:27:15.000000000 +0200 @@ -1,8 +1,26 @@ -Index: xfce4-session-4.10.0/scripts/xinitrc.in +Index: xfce4-session-4.10.1/scripts/xinitrc.in =================================================================== ---- xfce4-session-4.10.0.orig/scripts/xinitrc.in -+++ xfce4-session-4.10.0/scripts/xinitrc.in -@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then +--- xfce4-session-4.10.1.orig/scripts/xinitrc.in ++++ xfce4-session-4.10.1/scripts/xinitrc.in +@@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then + export XDG_MENU_PREFIX + fi + +-# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running ++# set DESKTOP_SESSION and XDG_CURRENT_DESKTOP so that one can detect easily if ++# an Xfce session is running + if test "x$DESKTOP_SESSION" = "x"; then + DESKTOP_SESSION="xfce" + export DESKTOP_SESSION + fi ++if test "x$XDG_CURRENT_DESKTOP" = "x"; then ++ XDG_CURRENT_DESKTOP="XFCE" ++ export XDG_CURRENT_DESKTOP ++fi + + # $XDG_CONFIG_HOME defines the base directory relative to which user specific + # configuration files should be stored. If $XDG_CONFIG_HOME is either not set +@@ -38,12 +43,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" @@ -15,7 +33,7 @@ # 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,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +80,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap @@ -140,11 +158,29 @@ -esac - -xsetroot -bg white -fg red -solid black -cursor_name watch -Index: xfce4-session-4.10.0/scripts/xinitrc.in.in +Index: xfce4-session-4.10.1/scripts/xinitrc.in.in =================================================================== ---- xfce4-session-4.10.0.orig/scripts/xinitrc.in.in -+++ xfce4-session-4.10.0/scripts/xinitrc.in.in -@@ -38,12 +38,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then +--- xfce4-session-4.10.1.orig/scripts/xinitrc.in.in ++++ xfce4-session-4.10.1/scripts/xinitrc.in.in +@@ -16,11 +16,16 @@ if test "x$XDG_MENU_PREFIX" = "x"; then + export XDG_MENU_PREFIX + fi + +-# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running ++# set DESKTOP_SESSION and XDG_CURRENT_DESKTOP so that one can detect easily if ++# an Xfce session is running + if test "x$DESKTOP_SESSION" = "x"; then + DESKTOP_SESSION="xfce" + export DESKTOP_SESSION + fi ++if test "x$XDG_CURRENT_DESKTOP" = "x"; then ++ XDG_CURRENT_DESKTOP="XFCE" ++ export XDG_CURRENT_DESKTOP ++fi + + # $XDG_CONFIG_HOME defines the base directory relative to which user specific + # configuration files should be stored. If $XDG_CONFIG_HOME is either not set +@@ -38,12 +43,6 @@ if test "x$XDG_CACHE_HOME" = "x" ; then fi [ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" @@ -157,7 +193,7 @@ # 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,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp +@@ -81,112 +80,17 @@ cat /dev/null $XRESOURCES | xrdb -nocpp # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap @@ -282,10 +318,10 @@ -esac - -xsetroot -bg white -fg red -solid black -cursor_name watch -Index: xfce4-session-4.10.0/scripts/startxfce4.in +Index: xfce4-session-4.10.1/scripts/startxfce4.in =================================================================== ---- xfce4-session-4.10.0.orig/scripts/startxfce4.in -+++ xfce4-session-4.10.0/scripts/startxfce4.in +--- xfce4-session-4.10.1.orig/scripts/startxfce4.in ++++ xfce4-session-4.10.1/scripts/startxfce4.in @@ -66,13 +66,22 @@ fi if test "x$XDG_DATA_DIRS" = "x" ++++++ xfce4-session-set-desktop-name.patch ++++++ Index: xfce4-session-4.10.1/xfce.desktop.in =================================================================== --- xfce4-session-4.10.1.orig/xfce.desktop.in +++ xfce4-session-4.10.1/xfce.desktop.in @@ -5,3 +5,4 @@ _Comment=Use this session to run Xfce as Exec=startxfce4 Icon= Type=Application +DesktopName=XFCE -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
