[SCM] jconv/master: Refreshed patches

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

The following commit has been merged in the master branch:
commit 091e2bc479e449180746e0839568daaf47b4fdb7
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Oct 20 10:18:31 2011 +0200

    Refreshed patches

diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 20bdb61..ca8fee7 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -3,10 +3,12 @@ Patch is applied because autotools are not used by upstream author. Patch settin
  source/Makefile |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
---- jconv.orig/source/Makefile
-+++ jconv/source/Makefile
-@@ -15,14 +15,15 @@
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Index: jconv/source/Makefile
+===================================================================
+--- jconv.orig/source/Makefile	2011-10-20 10:02:45.488010002 +0200
++++ jconv/source/Makefile	2011-10-20 10:13:01.383064063 +0200
+@@ -19,14 +19,15 @@
+ # --------------------------------------------------------------------------------
  
  
 -PREFIX = /usr/local
@@ -15,11 +17,11 @@ Patch is applied because autotools are not used by upstream author. Patch settin
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
  DISTDIR = jconvolver-$(VERSION)
- VERSION = 0.8.7
+ VERSION = 0.9.1
  LDFLAGS += -L$(PREFIX)/$(LIBDIR)
  CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\"
 -CPPFLAGS += -march=native
 +CPPFLAGS += -ffast-math -funroll-loops
  
  
- # Uncomment if you use a libsndfile version without support for
+ all:	jconvolver fconvolver makemulti
diff --git a/debian/patches/makefile2.patch b/debian/patches/makefile2.patch
index c5b7711..311b30a 100644
--- a/debian/patches/makefile2.patch
+++ b/debian/patches/makefile2.patch
@@ -3,9 +3,11 @@ Patch is applied to prevent possible future clash with other binary
  source/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
---- jconv.orig/source/Makefile
-+++ jconv/source/Makefile
-@@ -63,7 +63,8 @@ makemulti:	$(MAKEMULTI_O)
+Index: jconv/source/Makefile
+===================================================================
+--- jconv.orig/source/Makefile	2011-10-20 10:14:59.987652189 +0200
++++ jconv/source/Makefile	2011-10-20 10:15:03.339668814 +0200
+@@ -60,7 +60,8 @@
  install:	all
  	install -Dm 755 jconvolver $(DESTDIR)$(PREFIX)/bin/jconvolver
  	install -Dm 755 fconvolver $(DESTDIR)$(PREFIX)/bin/fconvolver

-- 
jconv packaging