[SCM] aeolus packaging branch, master, updated. debian/0.8.4-1-1-gd7f1dae

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

The following commit has been merged in the master branch:
commit d7f1daeb7ecec4138f689bc2a7238ae213c3ea34
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sun Apr 18 12:02:35 2010 +0200

    Adjust 01-makefile.patch to prevent FTBFS with binutils-gold (Closes: #553630).

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index e2dfd57..a1af902 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,12 +1,14 @@
 Author: Alessio Treglia <quadrispro at ubuntu.com>
 Description: Add DESTDIR, adjust PREFIX and append SONAME to the libraries.
+ Plus, fix FTBFS with binutils-gold.
+Bug: http://bugs.debian.org/553630
 ---
- source/Makefile |   22 ++++++++++++++--------
- 1 file changed, 14 insertions(+), 8 deletions(-)
+ source/Makefile |   24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
 
 --- aeolus.orig/source/Makefile
 +++ aeolus/source/Makefile
-@@ -15,13 +15,16 @@
+@@ -15,20 +15,23 @@
  #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
  
@@ -25,6 +27,14 @@ Description: Add DESTDIR, adjust PREFIX and append SONAME to the libraries.
  
  all:	aeolus aeolus_x11.so aeolus_txt.so
  
+ 
+ AEOLUS_O =	main.o audio.o model.o slave.o imidi.o addsynth.o scales.o \
+ 		reverb.o asection.o division.o rankwave.o rngen.o exp2ap.o lfqueue.o
+-aeolus:	LDLIBS += -lclalsadrv -lclthreads -lpthread -ljack -lasound -lpthread -lrt
++aeolus:	LDLIBS += -lclalsadrv -lclthreads -lpthread -ljack -lasound -ldl -lrt
+ aeolus: LDFLAGS += -L$(PREFIX)/$(LIBDIR)
+ aeolus:	$(AEOLUS_O)
+ 	g++ $(LDFLAGS) -o $@ $(AEOLUS_O) $(LDLIBS)
 @@ -44,7 +47,7 @@ aeolus_x11.so:	CPPFLAGS += -fpic -D_REEN
  aeolus_x11.so:	LDLIBS += -lclthreads -lclxclient -lXft -lX11
  aeolus_x11.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)

-- 
aeolus packaging