[SCM] clxclient/master: Refresh patches

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c25c3b60e966205305ca45f292484f8fd2c6bd99
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Feb 2 01:14:56 2012 +0100

    Refresh patches

diff --git a/debian/patches/makefile-01.patch b/debian/patches/makefile-01.patch
index c19c1c1..a646e34 100644
--- a/debian/patches/makefile-01.patch
+++ b/debian/patches/makefile-01.patch
@@ -2,27 +2,23 @@ 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 @@
- 
+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 @@
  
  # Modify as required.
--#
+ #
 -PREFIX = /usr/local
--SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-+
-+DESTDIR =
-+
-+PREFIX = /usr
-+#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
++PREFIX ?= /usr/local
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+-LIBDIR = lib$(SUFFIX)
++LIBDIR ?= lib$(SUFFIX)
  
  
-@@ -47,11 +49,12 @@ $(CLXCLIENT_MIN): $(CLXCLIENT_O)
+ MAJVERS = 3
+@@ -47,11 +47,12 @@
  
  
  install:	$(CLXCLIENT_MIN)
diff --git a/debian/patches/makefile-02.patch b/debian/patches/makefile-02.patch
index 8d16dc9..9de0d6d 100644
--- a/debian/patches/makefile-02.patch
+++ b/debian/patches/makefile-02.patch
@@ -3,12 +3,11 @@ 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)
+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 @@
  
  
  CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 

-- 
clxclient packaging