[Pkg-wmaker-commits] [wmmixer] 08/16: Fix FTBFS with ld --as-needed Patch sent by Angel Abad <angelabad at ubuntu.com>

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository wmmixer.

commit c902d518fe931396d042607046abef76a0c41641
Author: Rodolfo Garcia <kix at osaka.kix.es>
Date:   Mon Sep 19 15:35:10 2011 +0200

    Fix FTBFS with ld --as-needed Patch sent by Angel Abad <angelabad at ubuntu.com>
---
 CHANGES          | 3 +++
 Makefile         | 4 ++--
 debian/changelog | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index cd05006..d0cc90c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -90,3 +90,6 @@ Release 1.6   13 Jul 2011 Support of multiple config files to run multiple
                           02_multiple_config_files.patch
                           03_hurd_support.patch
                           04_xclass_support.patch
+
+Release 1.7   19 Sep 2011 Fix FTBFS with ld --as-needed
+                          Patch sent by Angel Abad <angelabad at ubuntu.com>
diff --git a/Makefile b/Makefile
index 47cef3d..dd61730 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ EXTRA_LIBS  = -L/usr/X11R6/lib -lX11 -lXpm -lXext
 
 
 LD 	    = g++
-LDFLAGS     = -o $(EXECUTABLE) $(EXTRA_LIBDIRS) $(EXTRA_LIBS) $(CXXFLAGS)
+LDFLAGS     = -o $(EXECUTABLE) $(CXXFLAGS)
 
 EXECUTABLE  = wmmixer
 OBJS	    = xhandler.o mixctl.o wmmixer.o exception.o
@@ -26,7 +26,7 @@ INSTALL_PROGRAM = $(INSTALL) -D -p    -o root -g root  -m  755
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 $(EXECUTABLE): $(OBJS)
-	$(LD) $(LDFLAGS) $(OBJS)
+	$(LD) $(LDFLAGS) $(OBJS) $(EXTRA_LIBDIRS) $(EXTRA_LIBS)
 
 all: $(EXECUTABLE)
 
diff --git a/debian/changelog b/debian/changelog
index 73d4166..e869521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmmixer (1.7-1) unstable; urgency=low
+
+  * New upstream version 1.7
+    - Fix FTBFS with ld --as-needed
+      Patch sent by Angel Abad <angelabad at ubuntu.com> [Closes: #640301]
+
+ -- Rodolfo García Peñas (kix) <kix at kix.es>  Mon, 19 Sep 2011 15:29:32 +0200
+
 wmmixer (1.6-2) unstable; urgency=low
 
   * debian/copyright is now DEP-5

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmixer.git