[SCM] aeolus/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 78ba2c8b3ff2408ea00ab036a32796c0f4ae0759
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Aug 8 10:34:04 2013 +0100

    Refresh patches.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 508ea44..b216e77 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -9,69 +9,37 @@ Description: Add DESTDIR and adjust PREFIX envvars.
 Bug: http://bugs.debian.org/553630
 Bug: http://bugs.debian.org/578278
 ---
- source/Makefile |   23 +++++++++++------------
- 1 file changed, 11 insertions(+), 12 deletions(-)
+ source/Makefile |   11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
 
 --- aeolus.orig/source/Makefile
 +++ aeolus/source/Makefile
-@@ -15,20 +15,18 @@
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+@@ -18,14 +18,12 @@
+ # -------------------------------------------------------------------------
  
  
 -PREFIX = /usr/local
 -SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 +PREFIX = /usr
  LIBDIR = lib$(SUFFIX)
- VERSION = 0.8.4
+ VERSION = 0.9.0
  DISTDIR = aeolus-$(VERSION)
--CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)\"
--CPPFLAGS += -march=native
-+CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)/aeolus\"
+-CPPFLAGS += -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)\"
++CPPFLAGS += -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)/aeolus\"
+ CXXFLAGS += -O3 -Wall -MMD -MP
+-CXXFLAGS += -march=native
  
  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)
-@@ -41,7 +39,7 @@ $(AEOLUS_O):
- XIFACE_O =	styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o midimatrix.o \
- 		multislider.o functionwin.o xiface.o addsynth.o
- aeolus_x11.so:	CPPFLAGS += -fpic -D_REENTRANT -I/usr/X11R6/include -I/usr/include/freetype2
--aeolus_x11.so:	LDLIBS += -lclthreads -lclxclient -lXft -lX11
-+aeolus_x11.so:	LDLIBS += -pthread -lclthreads -lclxclient -lXft -lX11
- aeolus_x11.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
- aeolus_x11.so: $(XIFACE_O) $(LIBCLX)
- 	g++ $(LDFLAGS) -o $@ $(XIFACE_O) $(LDLIBS)
-@@ -52,20 +50,21 @@ $(XIFACE_O):
- 
- TIFACE_O =	tiface.o
- aeolus_txt.so:	CPPFLAGS += -fpic -D_REENTRANT
--aeolus_txt.so:	LDLIBS += -lclthreads -lreadline
-+aeolus_txt.so:	LDLIBS += -pthread -lclthreads -lreadline
- aeolus_txt.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR)
- aeolus_txt.so: $(TIFACE_O)
--	g++ $(LDFLAGS) -o $@ $(TIFACE_O) $(LDLIBS)
-+	g++ $(LDFLAGS) -o $(@) $(TIFACE_O) $(LDLIBS)
- 
- $(TIFACE_O):
- -include $(TIFACE_O:%.o=%.d)
- 
+@@ -69,9 +67,8 @@ $(TIFACE_O):
  
  install:	aeolus aeolus_x11.so aeolus_txt.so 
--	install -Dm 755 aeolus $(DESTDIR)$(PREFIX)/bin/aeolus
+ 	install -Dm 755 aeolus $(DESTDIR)$(PREFIX)/bin/aeolus
 -	install -Dm 755 aeolus_x11.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus_x11.so
 -	install -Dm 755 aeolus_txt.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus_txt.so
--	/sbin/ldconfig $(PREFIX)/$(LIBDIR)
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 aeolus $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 aeolus_x11.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus
-+	/usr/bin/install -m 755 aeolus_txt.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus
+-	ldconfig $(PREFIX)/$(LIBDIR)
++	install -Dm 755 aeolus_x11.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus/aeolus_x11.so
++	install -Dm 755 aeolus_txt.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus/aeolus_txt.so
  
  
  clean:

-- 
aeolus packaging