[SCM] clxclient packaging branch, master, updated. debian/3.6.1-2-5-g71aae1a

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 71aae1a38798e2716a4cbdfcd31401c726ba8395
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jul 8 09:46:57 2010 +0200

    Patch sent upstream, add comments as per DEP-3.

diff --git a/debian/patches/makefile-01.patch b/debian/patches/makefile-01.patch
index 60aaade..c19c1c1 100644
--- a/debian/patches/makefile-01.patch
+++ b/debian/patches/makefile-01.patch
@@ -1,8 +1,12 @@
-Patch is applied to change install prefix from /usr/local/bin to /usr/bin
-Index: clxclient/Makefile
-===================================================================
---- clxclient.orig/Makefile	2010-01-10 14:01:18.000000000 +0100
-+++ clxclient/Makefile	2010-01-10 14:04:12.000000000 +0100
+Description: Change install prefix from /usr/local/bin to /usr/bin
+Origin: Debian
+Forwarded: not-needed
+---
+ Makefile |   19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+--- clxclient.orig/Makefile
++++ clxclient/Makefile
 @@ -16,9 +16,11 @@
  
  
@@ -18,7 +22,7 @@ Index: clxclient/Makefile
  LIBDIR = lib$(SUFFIX)
  
  
-@@ -47,11 +49,12 @@
+@@ -47,11 +49,12 @@ $(CLXCLIENT_MIN): $(CLXCLIENT_O)
  
  
  install:	$(CLXCLIENT_MIN)
diff --git a/debian/patches/makefile-02.patch b/debian/patches/makefile-02.patch
index 82b6b78..8d16dc9 100644
--- a/debian/patches/makefile-02.patch
+++ b/debian/patches/makefile-02.patch
@@ -1,9 +1,14 @@
-Patch is applied to fix build with binutils-gold
-Index: clxclient/Makefile
-===================================================================
---- clxclient.orig/Makefile	2010-01-10 14:07:30.000000000 +0100
-+++ clxclient/Makefile	2010-01-10 14:09:21.000000000 +0100
-@@ -31,14 +31,14 @@
+Description: Patch is applied to fix build failure with binutils-gold.
+Origin: Debian
+Bug-Debian: http://bugs.debian.org/558847
+Forwarded: fons at kokkinizita.net
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- clxclient.orig/Makefile
++++ clxclient/Makefile
+@@ -31,14 +31,14 @@ DISTDIR = clxclient-$(VERSION)
  
  
  CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 

-- 
clxclient packaging