Merge lp:~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3 into lp:ubuntu/trusty/xfce4-session

[Jackson Doak]

Merge from debian

=== added directory '.pc/01_fix-xrdb-call.patch'
=== added directory '.pc/01_fix-xrdb-call.patch/scripts'
=== added file '.pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in'
--- .pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in	1970-01-01 00:00:00 +0000
+++ .pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in	2013-10-23 21:22:20 +0000
@@ -0,0 +1,192 @@
+#!/bin/sh
+
+# fix broken $UID on some system...
+if test "x$UID" = "x"; then
+  if test -x /usr/xpg4/bin/id; then
+    UID=`/usr/xpg4/bin/id -u`;
+  else
+    UID=`id -u`;
+  fi
+fi
+
+# set $XDG_MENU_PREFIX to "xfce-" so that "xfce-applications.menu" is picked
+# over "applications.menu" in all Xfce applications.
+if test "x$XDG_MENU_PREFIX" = "x"; then
+  XDG_MENU_PREFIX="xfce-"
+  export XDG_MENU_PREFIX
+fi
+
+# set DESKTOP_SESSION 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
+
+# $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
+# or empty, a default equal to $HOME/.config should be used.
+if test "x$XDG_CONFIG_HOME" = "x" ; then
+  XDG_CONFIG_HOME=$HOME/.config
+fi
+[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME"
+
+# $XDG_CACHE_HOME defines the base directory relative to which user specific
+# non-essential data files should be stored. If $XDG_CACHE_HOME is either not
+# set or empty, a default equal to $HOME/.cache should be used.
+if test "x$XDG_CACHE_HOME" = "x" ; then
+  XDG_CACHE_HOME=$HOME/.cache
+fi
+[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
+
+# set up XDG user directores.  see
+# http://freedesktop.org/wiki/Software/xdg-user-dirs
+if which xdg-user-dirs-update >/dev/null 2>&1; then
+    xdg-user-dirs-update
+fi
+
+# 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@"
+GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:@XFCE_GLADE_PIXMAP_PATH@"
+GLADE_MODULE_PATH="$GLADE_MODULE_PATH:@XFCE_GLADE_MODULE_PATH@"
+export GLADE_CATALOG_PATH
+export GLADE_PIXMAP_PATH
+export GLADE_MODULE_PATH
+
+# For now, start with an empty list
+XRESOURCES=""
+
+# Has to go prior to merging Xft.xrdb, as its the "Defaults" file
+test -r "@_sysconfdir_@/xdg/xfce4/Xft.xrdb" && XRESOURCES="$XRESOURCES @_sysconfdir_@/xdg/xfce4/Xft.xrdb"
+test -r $HOME/.Xdefaults && XRESOURCES="$XRESOURCES $HOME/.Xdefaults"
+
+BASEDIR=$XDG_CONFIG_HOME/xfce4
+if test -r "$BASEDIR/Xft.xrdb"; then
+  XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb"
+elif test -r "$XFCE4HOME/Xft.xrdb"; then
+  mkdir -p "$BASEDIR"
+  cp "$XFCE4HOME/Xft.xrdb" "$BASEDIR"/
+  XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb"
+fi
+
+# merge in X cursor settings
+test -r "$BASEDIR/Xcursor.xrdb" && XRESOURCES="$XRESOURCES $BASEDIR/Xcursor.xrdb"
+
+# ~/.Xresources contains overrides to the above
+test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources"
+
+# load all X resources (adds /dev/null to avoid an empty list that would hang the process)
+cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
+
+# load local modmap
+test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+
+# run xfce4-session if installed
+if which xfce4-session >/dev/null 2>&1; then
+
+  # 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 which ck-launch-session >/dev/null 2>&1; then
+      ck-launch-session xfce4-session
+    else
+      echo
+      echo "You have tried to start Xfce with consolekit support, but"
+      echo "ck-launch-session is not installed."
+      echo "Aborted startup..."
+      echo
+
+      exit 1
+    fi
+  else
+    # start xfce4-session normally
+    xfce4-session
+  fi
+
+  exit 0
+fi
+
+##################
+# IMPORTANT NOTE #
+##################
+
+# Everything below here ONLY gets executed if you are NOT using xfce4-session
+# (Xfce's session manager).  If you are using the session manager, everything
+# below is handled by it, and the code below is not executed at all.  If you're
+# not sure if you're using the session manager, type 'ps -e|grep xfce4-session'
+# in a terminal while Xfce is running.
+
+##################
+
+# Use dbus-launch if installed.
+if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
+  if which dbus-launch >/dev/null 2>&1; then
+    eval `dbus-launch --sh-syntax --exit-with-session`
+    # some older versions of dbus don't export the var properly
+    export DBUS_SESSION_BUS_ADDRESS
+  else
+    echo "Could not find dbus-launch; Xfce will not work properly" >&2
+    fi
+fi
+
+# this is only necessary when running w/o xfce4-session
+xsetroot -solid black -cursor_name watch
+
+# or use old-fashioned startup script otherwise
+
+xfsettingsd &
+xfwm4 --daemon
+
+# start up stuff in $XDG_CONFIG_HOME/autostart/
+if test -d "$XDG_CONFIG_HOME/autostart"; then
+  for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do
+    grep -q -E "^Hidden=true" "$i" && continue
+    if grep -q -E "^OnlyShowIn=" "$i"; then
+      # need to test twice, as lack of the line entirely means we still run it
+      grep -E "^OnlyShowIn=" "$i" | grep -q 'XFCE;' || continue
+    fi
+    grep -E "^NotShowIn=" "$i" | grep -q 'XFCE;' && continue
+
+    # check for TryExec
+    trycmd=`grep -E "^TryExec=" "$i" | cut -d'=' -f2`
+    if test "$trycmd"; then
+      which "$trycmd" >/dev/null 2>&1 || continue
+    fi
+
+    cmd=`grep -E "^Exec=" "$i" | cut -d'=' -f2`
+    if test "$cmd" && which "$cmd" >/dev/null 2>&1; then
+      $cmd &
+    fi
+  done
+fi
+
+xfdesktop&
+orage &
+
+panel=`which xfce4-panel`
+case "x$panel" in
+	x|xno*)
+		;;
+	*)
+		$panel
+		ret=$?
+		while test $ret -ne 0; do
+			xmessage -center -file - -timeout 20 -title Error <<EOF
+A crash occured in the panel
+Please report this to the [e-mail] list
+or on http://bugs.xfce.org
+Meanwhile the panel will be restarted
+EOF
+			cat >&2 <<EOF
+A crash occured in the panel
+Please report this to the [e-mail] list
+or on http://bugs.xfce.org
+Meanwhile the panel will be restarted
+EOF
+			$panel
+			ret=$?
+		done
+		;;
+esac
+
+xsetroot -bg white -fg red  -solid black -cursor_name watch
 
=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-07-01 19:35:39 +0000
+++ .pc/applied-patches	2013-10-23 21:22:20 +0000
@@ -1,3 +1,4 @@
+01_fix-xrdb-call.patch
 xubuntu_ignore-gdm-lang.patch
 xubuntu_set-xdg-current-desktop.patch
 xubuntu_runtime-logind-support.patch
 
=== modified file '.pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in'
--- .pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in	2012-05-18 20:21:52 +0000
+++ .pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in	2013-10-23 21:22:20 +0000
@@ -76,7 +76,7 @@
 test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources"
 
 # load all X resources (adds /dev/null to avoid an empty list that would hang the process)
-cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
+cat /dev/null $XRESOURCES | xrdb -merge -
 
 # load local modmap
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
 
=== added file 'debian/55xfce4-session'
--- debian/55xfce4-session	1970-01-01 00:00:00 +0000
+++ debian/55xfce4-session	2013-10-23 21:22:20 +0000
@@ -0,0 +1,18 @@
+# For Xfce, we add a directory to XDG_DATA_DIRS
+# to allow the admin to set, for example, defaults.list properly
+BASESTARTUP=$(basename "$STARTUP" | cut -d\  -f1)
+if [ "$BASESTARTUP" = x-session-manager ]; then
+    BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
+fi
+case "$BASESTARTUP" in
+  xfce4-session|startxfce4)
+    # We prepend /usr/share/xfce4 since its defaults.list actually points 
+    # to /etc so it is configurable.
+    if [ -z "$XDG_DATA_DIRS" ]; then
+      XDG_DATA_DIRS=/usr/share/xfce4:/usr/local/share/:/usr/share/
+    else
+      XDG_DATA_DIRS=/usr/share/xfce4:"$XDG_DATA_DIRS"
+    fi
+    export XDG_DATA_DIRS
+    ;;
+esac
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-07-01 19:35:39 +0000
+++ debian/changelog	2013-10-23 21:22:20 +0000
@@ -1,3 +1,56 @@
+xfce4-session (4.10.1-3ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable, remaining Ubuntu changes:
+    - debian/patches:
+      + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's
+        already an xsession script to do that, and $GDM_LANG might not contain
+        a valid locale code.
+      + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils,
+        export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and
+        gnome-menus. 
+      + debian/patches/xubuntu_runtime-logind-support.patch: 
+        Check for logind support at runtime
+    - debian/rules:
+      + call xdt-autogen after patching
+      + clean up autogenerated files modified by xdt-autogen.
+    - debian/control:
+      + add build-dep on libpolkit-gobject-1-dev (>= 0.100).
+      + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen
+        after patching.
+      + don't recommend consolekit anymore.
+
+ -- Jackson Doak <[e-mail]>  Thu, 24 Oct 2013 08:09:19 +1100
+
+xfce4-session (4.10.1-3) unstable; urgency=low
+
+  [ Jackson Doak ]
+  * debian/rules: Use disable-silent-build
+
+  [ Yves-Alexis Perez ]
+  * debian/patches:
+    - fix file patched in 01_fix-xrdb-call.            (really) closes: #648553
+  * debian/55xfce4-session:
+    - handle case where session is started as startxfce4.       closes: #725399
+
+ -- Yves-Alexis Perez <[e-mail]>  Wed, 09 Oct 2013 21:17:35 +0200
+
+xfce4-session (4.10.1-2) unstable; urgency=low
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Mark Hymers ]
+  * Add /usr/share/xfce4 to XDG_DATA_DIRS and add defaults.list symlink
+                                                                closes: #717875
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update standards version to 3.9.4.
+  * debian/patches:
+    - 01_fix-xrdb-call added, don't call xrdb with -nocpp.      closes: #648553
+
+ -- Yves-Alexis Perez <[e-mail]>  Tue, 17 Sep 2013 21:56:28 +0200
+
 xfce4-session (4.10.1-1ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable, remaining Ubuntu changes:
 
=== modified file 'debian/control'
--- debian/control	2013-07-01 19:35:39 +0000
+++ debian/control	2013-10-23 21:22:20 +0000
@@ -10,10 +10,10 @@
  libxfconf-0-dev (>= 4.10.0), libglade2-dev, intltool (>= 0.31),
  libpolkit-gobject-1-dev (>= 0.100), xfce4-dev-tools, libtool,
  dpkg-dev (>= 1.16.1)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.xfce.org/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/
+Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/xfce4-session/
 
 Package: xfce4-session
 Section: xfce
 
=== added file 'debian/defaults.list'
--- debian/defaults.list	1970-01-01 00:00:00 +0000
+++ debian/defaults.list	2013-10-23 21:22:20 +0000
@@ -0,0 +1,1 @@
+[Default Applications]
 
=== added file 'debian/patches/01_fix-xrdb-call.patch'
--- debian/patches/01_fix-xrdb-call.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_fix-xrdb-call.patch	2013-10-23 21:22:20 +0000
@@ -0,0 +1,11 @@
+--- a/scripts/xinitrc.in.in
++++ b/scripts/xinitrc.in.in
+@@ -76,7 +76,7 @@ test -r "$BASEDIR/Xcursor.xrdb" && XRESO
+ test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources"
+ 
+ # load all X resources (adds /dev/null to avoid an empty list that would hang the process)
+-cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
++cat /dev/null $XRESOURCES | xrdb -merge -
+ 
+ # load local modmap
+ test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-01 19:35:39 +0000
+++ debian/patches/series	2013-10-23 21:22:20 +0000
@@ -1,3 +1,4 @@
+01_fix-xrdb-call.patch
 xubuntu_ignore-gdm-lang.patch
 xubuntu_set-xdg-current-desktop.patch
 xubuntu_runtime-logind-support.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-07-01 19:35:39 +0000
+++ debian/rules	2013-10-23 21:22:20 +0000
@@ -3,10 +3,6 @@
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-override_dh_auto_configure:
-	NOCONFIGURE=1 xdt-autogen
-	dh_auto_configure
-
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f $$(find -name 'Makefile.in*') INSTALL ltmain.sh
@@ -20,5 +16,9 @@
 override_dh_strip:
 	dh_strip --dbg-package=xfce4-session-dbg
 
+override_dh_auto_configure:
+	NOCONFIGURE=1 xdt-autogen
+	dh_auto_configure -- --disable-silent-rules
+
 %:
 	dh $@ --parallel
 
=== added file 'debian/xfce4-session.dirs'
--- debian/xfce4-session.dirs	1970-01-01 00:00:00 +0000
+++ debian/xfce4-session.dirs	2013-10-23 21:22:20 +0000
@@ -0,0 +1,2 @@
+etc/xfce4
+etc/X11/Xsession.d
 
=== modified file 'debian/xfce4-session.install'
--- debian/xfce4-session.install	2011-02-15 00:18:12 +0000
+++ debian/xfce4-session.install	2013-10-23 21:22:20 +0000
@@ -1,2 +1,4 @@
 usr
 etc
+debian/defaults.list etc/xfce4/
+debian/55xfce4-session etc/X11/Xsession.d/
 
=== added file 'debian/xfce4-session.links'
--- debian/xfce4-session.links	1970-01-01 00:00:00 +0000
+++ debian/xfce4-session.links	2013-10-23 21:22:20 +0000
@@ -0,0 +1,1 @@
+etc/xfce4/defaults.list usr/share/xfce4/applications/defaults.list
 
=== modified file 'scripts/xinitrc.in.in'
--- scripts/xinitrc.in.in	2012-05-18 20:21:52 +0000
+++ scripts/xinitrc.in.in	2013-10-23 21:22:20 +0000
@@ -82,7 +82,7 @@
 test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources"
 
 # load all X resources (adds /dev/null to avoid an empty list that would hang the process)
-cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
+cat /dev/null $XRESOURCES | xrdb -merge -
 
 # load local modmap
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap