[SCM] jaaa packaging branch, master, updated. a8179cf02510811927b711010251d4c04022c972

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

The following commit has been merged in the master branch:
commit 8045425a6e5a3d1d550a20ed90b60308f08c0cd2
Author: Philippe Coval <rzr at gna.org>
Date:   Sat May 29 13:41:51 2010 +0200

    remove previous version patch

diff --git a/debian/patches/jaaa-0.4.2rzr.patch b/debian/patches/jaaa-0.4.2rzr.patch
deleted file mode 100644
index dc6d68d..0000000
--- a/debian/patches/jaaa-0.4.2rzr.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: jaaa-0.4.2/Makefile
-===================================================================
---- jaaa-0.4.2.orig/Makefile	2008-01-08 17:23:12.000000000 +0100
-+++ jaaa-0.4.2/Makefile	2008-01-08 17:26:21.000000000 +0100
-@@ -15,33 +15,36 @@
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- 
--PREFIX = /usr
-+PREFIX = ${DESTDIR}/usr
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.4.2
- DISTDIR = jaaa-$(VERSION)
--CPPFLAGS += -O3 -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
--#CPPFLAGS += -march=pentium4
-+
-+CXXFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
-+#CXXFLAGS +=-O3 -Wall
-+#CXXFLAGS += -march=pentium4
- 
- LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
--LDLIBS += -lclalsadrv -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
-+LDLIBS += -lclalsadrv -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lX11
-+# -lrt -lXft
- 
- JAAA_H = styles.h spectwin.h audio.h prbsgen.h rngen.h
- JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
- 
- 
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
--
-+	${CXX} $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
- 
- install:	jaaa
--	/usr/bin/install -m 755 jaaa $(PREFIX)/bin
-+	install -d ${PREFIX}/bin
-+	install -m 755 jaaa $(PREFIX)/bin
- 
- $(JAAA_O):	$(JAAA_H)
- 
- 
- clean:
--	/bin/rm -f *~ *.o *.a *.so jaaa
-+	${RM} -f *~ *.o *.a *.so jaaa
- 
- 
- tarball:
-@@ -51,3 +54,5 @@
- 	tar cvf $(DISTDIR).tar $(DISTDIR); \
- 	bzip2 $(DISTDIR).tar; \
- 	/bin/rm -f -r $(DISTDIR);
-+
-+#eof "$Id: rzr -- install in destdir  -- rzr at users.sf.net $"

-- 
jaaa packaging