[SCM] clxclient/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a6ad313cac4781c15a2eb048f311f1fc51d7a97d
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jul 7 00:33:07 2013 +0100

    Refresh patches.

diff --git a/debian/patches/makefile-01.patch b/debian/patches/makefile-01.patch
index a646e34..475d4a8 100644
--- a/debian/patches/makefile-01.patch
+++ b/debian/patches/makefile-01.patch
@@ -2,11 +2,13 @@ Description: Change install prefix from /usr/local/bin to /usr/bin
 Origin: Debian
 Forwarded: not-needed
 ---
-Index: clxclient/Makefile
-===================================================================
---- clxclient.orig/Makefile	2012-02-02 00:32:10.965043997 +0100
-+++ clxclient/Makefile	2012-02-02 01:10:22.584984150 +0100
-@@ -17,9 +17,9 @@
+---
+ Makefile |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- clxclient.orig/Makefile
++++ clxclient/Makefile
+@@ -21,9 +21,9 @@
  
  # Modify as required.
  #
@@ -18,20 +20,19 @@ Index: clxclient/Makefile
  
  
  MAJVERS = 3
-@@ -47,11 +47,12 @@
+@@ -50,11 +50,11 @@ $(CLXCLIENT_MIN): $(CLXCLIENT_O)
  
  
  install:	$(CLXCLIENT_MIN)
--	/usr/bin/install -d $(PREFIX)/$(LIBDIR)
--	/usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include
--	/usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)
--	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
+-	install -d $(PREFIX)/$(LIBDIR)
+-	install -m 644 $(CLXCLIENT_H) $(PREFIX)/include
+-	install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)
+-	ldconfig
 -	ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/include
-+	/usr/bin/install -m 644 $(CLXCLIENT_H) $(DESTDIR)$(PREFIX)/include
-+	/usr/bin/install -m 755 $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	/sbin/ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	install -d $(DESTDIR)$(PREFIX)/include
++	install -m 644 $(CLXCLIENT_H) $(DESTDIR)$(PREFIX)/include
++	install -m 755 $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
 +	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
  
  
diff --git a/debian/patches/makefile-02.patch b/debian/patches/makefile-02.patch
index 9de0d6d..d3199ad 100644
--- a/debian/patches/makefile-02.patch
+++ b/debian/patches/makefile-02.patch
@@ -3,16 +3,18 @@ Origin: Debian
 Bug-Debian: http://bugs.debian.org/558847
 Forwarded: fons at kokkinizita.net
 ---
-Index: clxclient/Makefile
-===================================================================
---- clxclient.orig/Makefile	2012-02-02 01:10:22.584984150 +0100
-+++ clxclient/Makefile	2012-02-02 01:12:41.052980539 +0100
-@@ -29,14 +29,14 @@
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- clxclient.orig/Makefile
++++ clxclient/Makefile
+@@ -32,14 +32,14 @@ VERSION = $(MAJVERS).$(MINVERS)
  
  
  CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
--LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR) `freetype-config --libs`
-+LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR) -Wl,--as-needed `freetype-config --libs`
+-LDFLAGS += -L/usr/X11R6/$(LIBDIR) `freetype-config --libs`
++LDFLAGS += -L/usr/X11R6/$(LIBDIR) -Wl,--as-needed `freetype-config --libs`
  LDLIBS +=
  
  

-- 
clxclient packaging