[SCM] ambdec/master: debian/patches/01-destdir.patch: Refresh, append -pthread to LDFLAGS to prevent FTBFS with newer toolchain.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6cc8e0a13b8877eb17764a760b7f4689709bc094
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 11 00:42:46 2011 +0100

    debian/patches/01-destdir.patch: Refresh, append -pthread to LDFLAGS to prevent FTBFS with newer toolchain.

diff --git a/debian/patches/01-destdir.patch b/debian/patches/01-destdir.patch
index 4110fe8..03a0243 100644
--- a/debian/patches/01-destdir.patch
+++ b/debian/patches/01-destdir.patch
@@ -1,34 +1,29 @@
 Author: Alessio Treglia <quadrispro at ubuntu.com>
 Description: Declare DESTDIR var to allow setting a custom path, set PREFIX
  to /usr.
+ Add -pthread flag to fix FTBFS in Ubuntu Natty.
+Forwarded: no
 ---
- source/Makefile |   11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
+ source/Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
---- ambdec-0.4.2.orig/source/Makefile
-+++ ambdec-0.4.2/source/Makefile
-@@ -15,7 +15,8 @@
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+--- ambdec.orig/source/Makefile
++++ ambdec/source/Makefile
+@@ -19,7 +19,7 @@
+ # ----------------------------------------------------------------------------
  
  
 -PREFIX = /usr/local
-+DESTDIR =
 +PREFIX = /usr
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
  SHARED = $(PREFIX)/share
-@@ -55,10 +56,10 @@ $(AMBDEC_CLI_O):
+@@ -38,7 +38,7 @@ AMBDEC_O = ambdec.o styles.o mainwin.o t
  
+ ambdec:	CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
+ ambdec:	LDLIBS += -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
+-ambdec:	LDFLAGS += -L/usr/X11R6/lib
++ambdec:	LDFLAGS += -pthread -L/usr/X11R6/lib
+ ambdec:	$(AMBDEC_O)
+ 	g++ $(LDFLAGS) -o $@ $(AMBDEC_O) $(LDLIBS)
  
- install:	all
--	/usr/bin/install -m 755 ambdec $(PREFIX)/bin
--	/usr/bin/install -m 755 ambdec_cli $(PREFIX)/bin
--	/usr/bin/install -d $(SHARED)/ambdec
--	/usr/bin/install -m 644 ../share/* $(SHARED)/ambdec
-+	/usr/bin/install -m 755 ambdec $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 ambdec_cli $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -d $(DESTDIR)$(SHARED)/ambdec
-+	/usr/bin/install -m 644 ../share/* $(DESTDIR)$(SHARED)/ambdec
- 
- 
- clean:

-- 
ambdec packaging