[Pkg-xfce-commits] r4603 - in desktop/trunk/xfce4-utils/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-12-03 17:21:03 +0000 (Fri, 03 Dec 2010)
New Revision: 4603

Added:
   desktop/trunk/xfce4-utils/debian/patches/05_fix-comment-char-in-xrdb-file.patch
Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/patches/series
Log:
* debian/patches:
  - 05_fix-comment-char-in-xrdb-file added, patch by Mike Massonnet to fix
    wrong comments character in xrdb file and warnings output to
    .xsession-errors.                                         closes: #605802

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2010-11-30 16:56:55 UTC (rev 4602)
+++ desktop/trunk/xfce4-utils/debian/changelog	2010-12-03 17:21:03 UTC (rev 4603)
@@ -1,3 +1,12 @@
+xfce4-utils (4.6.2-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 05_fix-comment-char-in-xrdb-file added, patch by Mike Massonnet to fix
+      wrong comments character in xrdb file and warnings output to
+      .xsession-errors.                                         closes: #605802
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 27 Aug 2010 10:07:59 +0200
+
 xfce4-utils (4.6.2-1) unstable; urgency=low
 
   [ Stefan Ott ]

Added: desktop/trunk/xfce4-utils/debian/patches/05_fix-comment-char-in-xrdb-file.patch
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/05_fix-comment-char-in-xrdb-file.patch	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/patches/05_fix-comment-char-in-xrdb-file.patch	2010-12-03 17:21:03 UTC (rev 4603)
@@ -0,0 +1,28 @@
+From b55be8ded0c7e1119eb062a5831b246b618c89e8 Mon Sep 17 00:00:00 2001
+From: Mike Massonnet <mmassonnet at gmail.com>
+Date: Thu, 8 Apr 2010 22:38:50 +0200
+Subject: [PATCH] use right comment character (! and not #) in Xft.xrdb file (bug 6314)
+
+---
+ scripts/Xft.xrdb |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/Xft.xrdb b/scripts/Xft.xrdb
+index af45361..cd26513 100644
+--- a/scripts/Xft.xrdb
++++ b/scripts/Xft.xrdb
+@@ -1,7 +1,7 @@
+-# Those are fallback settings, use the ui plugin to change it
+-# or add your overrides to ~/.Xresources
+-# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
+-# Xft hinting: 1/0
++! Those are fallback settings, use the ui plugin to change it
++! or add your overrides to ~/.Xresources
++! Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
++! Xft hinting: 1/0
+ 
+ Xft.hinting: 1
+ Xft.hintstyle: hintmedium
+-- 
+1.7.0.3
+

Modified: desktop/trunk/xfce4-utils/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/series	2010-11-30 16:56:55 UTC (rev 4602)
+++ desktop/trunk/xfce4-utils/debian/patches/series	2010-12-03 17:21:03 UTC (rev 4603)
@@ -2,3 +2,4 @@
 02_use-Xsessions.options-for-ssh-agent-handling.patch
 03_xfterm4-bug.patch
 04_debianize-scripts.patch
+05_fix-comment-char-in-xrdb-file.patch