[SCM] jkmeter/master: Pass -pthread flag to the linker to fix FTBFS with binutils-gold. Improve patch description.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a56b88f3885cae6619b6d30cfd027c1c8765ef4b
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 4 01:21:51 2010 +0100

    Pass -pthread flag to the linker to fix FTBFS with binutils-gold. Improve patch description.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index d0e9ca3..ae17dfb 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,9 +1,12 @@
-Description: Append PREFIX variable to set installation path properly.
+Description: Put DESTDIR before PREFIX to set the installation path properly.
  Set prefix properly and fix install commands.
+ Pass -pthread flag to the linker to fix FTBFS with binutils-gold.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: Fons Adriaensen <fons at kokkinizita.net>
 ---
- source/Makefile |   11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
+ source/Makefile |   13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
 
 --- jkmeter.orig/source/Makefile
 +++ jkmeter/source/Makefile
@@ -18,6 +21,15 @@ Author: Jaromír Mikeš <mira.mikes at seznam.cz>
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
  SHARED = $(PREFIX)/share
+@@ -34,7 +35,7 @@ JKMETER_O = jkmeter.o styles.o mainwin.o
+ 
+ jkmeter:	CPPFLAGS += -ffast-math -I/usr/include/freetype2
+ jkmeter:	LDLIBS += -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
+-jkmeter:	LDFLAGS += -L/usr/X11R6/lib
++jkmeter:	LDFLAGS += -L/usr/X11R6/lib -pthread
+ jkmeter:	$(JKMETER_O)
+ 	g++ $(LDFLAGS) -o $@ $(JKMETER_O) $(LDLIBS)
+ 
 @@ -43,10 +44,10 @@ $(JKMETER_O):
  
  

-- 
jkmeter packaging