[Pkg-xfce-commits] r7901 - in /desktop/trunk/xfce4-session/debian: changelog patches/01_fix-xrdb-call.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Mon Sep 16 05:46:18 2013
New Revision: 7901

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=7901
Log:
* debian/patches:
  - 01_fix-xrdb-call added, don't call xrdb with -nocpp.      closes: #648553

Added:
    desktop/trunk/xfce4-session/debian/patches/01_fix-xrdb-call.patch
    desktop/trunk/xfce4-session/debian/patches/series
Modified:
    desktop/trunk/xfce4-session/debian/changelog

Modified: desktop/trunk/xfce4-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/changelog?rev=7901&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/changelog	(original)
+++ desktop/trunk/xfce4-session/debian/changelog	Mon Sep 16 05:46:18 2013
@@ -10,6 +10,8 @@
   [ 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
 
  -- Mark Hymers <mhy at debian.org>  Fri, 26 Jul 2013 23:22:28 +0100
 

Added: desktop/trunk/xfce4-session/debian/patches/01_fix-xrdb-call.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/patches/01_fix-xrdb-call.patch?rev=7901&op=file
==============================================================================
--- desktop/trunk/xfce4-session/debian/patches/01_fix-xrdb-call.patch	(added)
+++ desktop/trunk/xfce4-session/debian/patches/01_fix-xrdb-call.patch	Mon Sep 16 05:46:18 2013
@@ -0,0 +1,11 @@
+--- a/scripts/xinitrc.in
++++ b/scripts/xinitrc.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

Added: desktop/trunk/xfce4-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/patches/series?rev=7901&op=file
==============================================================================
--- desktop/trunk/xfce4-session/debian/patches/series	(added)
+++ desktop/trunk/xfce4-session/debian/patches/series	Mon Sep 16 05:46:18 2013
@@ -0,0 +1 @@
+01_fix-xrdb-call.patch