[SCM] jaaa/master: Patch refreshed

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

The following commit has been merged in the master branch:
commit 96320c6aaf27aaec04eb6fa56130f5a34f263261
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Aug 7 14:04:35 2013 +0200

    Patch refreshed

diff --git a/debian/patches/jaaa-rzr.patch b/debian/patches/jaaa-rzr.patch
index bfb80fe..0d7024f 100644
--- a/debian/patches/jaaa-rzr.patch
+++ b/debian/patches/jaaa-rzr.patch
@@ -4,9 +4,11 @@ Description: Set DESTDIR,CXXFLAGS,LDLIBS properly.
  Makefile |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
---- jaaa.orig/Makefile
-+++ jaaa/Makefile
-@@ -19,27 +19,27 @@
+Index: jaaa/source/Makefile
+===================================================================
+--- jaaa.orig/source/Makefile	2013-08-07 13:38:13.937342777 +0200
++++ jaaa/source/Makefile	2013-08-07 14:01:17.176201895 +0200
+@@ -19,13 +19,13 @@
  #  --------------------------------------------------------------------------
  
  
@@ -14,28 +16,20 @@ Description: Set DESTDIR,CXXFLAGS,LDLIBS properly.
 +PREFIX = /usr
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
- VERSION = 0.6.0
- DISTDIR = jaaa-$(VERSION)
--CPPFLAGS += -O2 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
--CPPFLAGS += -march=native
-+CXXFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
+ VERSION = 0.8.4
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
+-CXXFLAGS += -O2 -Wall -MMD -MP
+-CXXFLAGS += -march=native
++CXXFLAGS += -O3 -Wall -MMD -MP
++#CXXFLAGS += -march=native
+ LDFLAGS += -L/usr/X11R6/$(LIBDIR)
+ LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
  
- 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
- 
- 
- JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
-+	${CXX} $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
- 
- $(JAAA_O):
- -include $(JAAA_O:%.o=%.d)
+@@ -39,6 +39,7 @@
  
  
  install:	jaaa
 +	install -d ${DESTDIR}${PREFIX}/bin
  	install -Dm 755 jaaa $(DESTDIR)$(PREFIX)/bin/jaaa
  
- clean:
+ uninstall:

-- 
jaaa packaging