[SCM] aliki/master: Patches refreshed

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

The following commit has been merged in the master branch:
commit 6f09df01d337eefce6385a94b28f1ec0ac61ab9f
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Aug 5 22:40:38 2013 +0200

    Patches refreshed

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 02fed8c..4ffbfd2 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -5,9 +5,9 @@ Forwarded: no
 
 Index: aliki/source/Makefile
 ===================================================================
---- aliki.orig/source/Makefile	2013-05-06 12:43:20.412493844 +0200
-+++ aliki/source/Makefile	2013-05-06 12:43:20.408493827 +0200
-@@ -21,7 +21,9 @@
+--- aliki.orig/source/Makefile	2013-08-05 22:37:06.815208408 +0200
++++ aliki/source/Makefile	2013-08-05 22:37:43.467209898 +0200
+@@ -20,13 +20,15 @@
  
  # Modify as required.
  #
@@ -17,17 +17,15 @@ Index: aliki/source/Makefile
 +PREFIX = /usr
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
- VERSION = 0.2.0
-@@ -34,7 +36,7 @@
- # With debug info
- CXXFLAGS += -g
- 
+ VERSION = 0.3.0
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\"
+ CXXFLAGS += -O2 -Wall -MMD -MP
 -CXXFLAGS += -march=native
 +#CXXFLAGS += -march=native
  
- # Uncomment if you use a libsndfile version without support for setting/getting the Ambisonic flags.
- #
-@@ -67,8 +69,9 @@
+ 
+ all:	aliki aliki-rt
+@@ -56,8 +58,9 @@
  
  
  install:	aliki aliki-rt
@@ -37,5 +35,5 @@ Index: aliki/source/Makefile
 +	/usr/bin/install -m 755 aliki    $(DESTDIR)$(PREFIX)/bin
 +	/usr/bin/install -m 755 aliki-rt $(DESTDIR)$(PREFIX)/bin
  
- clean:
- 	/bin/rm -f *~ *.o *.a *.d *.so
+ uninstall:
+ 	/bin/rm -f $(DESTDIR)$(PREFIX)/bin/aliki
diff --git a/debian/patches/02-spelling_fix.patch b/debian/patches/02-spelling_fix.patch
index 8d4aef5..3c4f7c1 100644
--- a/debian/patches/02-spelling_fix.patch
+++ b/debian/patches/02-spelling_fix.patch
@@ -4,9 +4,9 @@ Forwarded: no
 
 Index: aliki/source/captwin.cc
 ===================================================================
---- aliki.orig/source/captwin.cc	2013-05-06 12:43:03.668410807 +0200
-+++ aliki/source/captwin.cc	2013-05-06 12:43:03.664410797 +0200
-@@ -408,7 +408,7 @@
+--- aliki.orig/source/captwin.cc	2013-08-05 22:34:23.219201756 +0200
++++ aliki/source/captwin.cc	2013-08-05 22:34:23.215201756 +0200
+@@ -407,7 +407,7 @@
      _tequal->set_align (1);
   
      y += 35;
diff --git a/debian/patches/series b/debian/patches/series
index 139b7a5..2eee416 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-02-spelling_fix.patch
 01-makefile.patch
+02-spelling_fix.patch

-- 
aliki packaging