[SCM] jconv packaging branch, master, updated. debian/0.8.1-1-42-g0ed85ac

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

The following commit has been merged in the master branch:
commit 00683ab4ded7f2576090095fb28aa4bd7758c4bf
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed Mar 10 20:56:41 2010 +0100

    Refresh patches.

diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 4f362ed..e1c98a9 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -1,38 +1,25 @@
 Patch is applied because autotools are not used by upstream author. Patch setting prefix=/usr and fix install commands and remove some cppflags
-Index: jconv/source/Makefile
-===================================================================
---- jconv.orig/source/Makefile	2009-12-07 20:17:31.000000000 +0100
-+++ jconv/source/Makefile	2009-12-07 20:31:46.000000000 +0100
-@@ -14,15 +14,16 @@
- #  along with this program; if not, write to the Free Software
+---
+ 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.
  
--
+ 
 -PREFIX = /usr/local
 +DESTDIR=
 +PREFIX = /usr
  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.4
+ VERSION = 0.8.6
  LDFLAGS += -L$(PREFIX)/$(LIBDIR)
  CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\"
--#CPPFLAGS += -march=i686 -mtune=pentium4 -msse -msse2 -m3dnow -O3 -ffast-math
+-CPPFLAGS += -march=native
 +CPPFLAGS += -ffast-math -funroll-loops
-+#CPPFLAGS += -march=native
  
  
  # Uncomment if you use a libsndfile version without support for
-@@ -60,9 +61,9 @@
- 
- 
- install:	all
--	/usr/bin/install -m 755 jconvolver $(PREFIX)/bin
--	/usr/bin/install -m 755 fconvolver $(PREFIX)/bin
--	/usr/bin/install -m 755 makemulti $(PREFIX)/bin
-+	/usr/bin/install -m 755 jconvolver $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 fconvolver $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 makemulti $(DESTDIR)$(PREFIX)/bin
- 
- 
- clean:
diff --git a/debian/patches/makefile2.patch b/debian/patches/makefile2.patch
index 9c5b9f4..c5b7711 100644
--- a/debian/patches/makefile2.patch
+++ b/debian/patches/makefile2.patch
@@ -1,15 +1,17 @@
 Patch is applied to prevent possible future clash with other binary 
-Index: jconv/source/Makefile
-===================================================================
---- jconv.orig/source/Makefile	2010-02-05 18:01:45.737626843 +0100
-+++ jconv/source/Makefile	2010-02-05 18:03:03.598618429 +0100
-@@ -63,7 +63,8 @@
+---
+ source/Makefile |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- jconv.orig/source/Makefile
++++ jconv/source/Makefile
+@@ -63,7 +63,8 @@ makemulti:	$(MAKEMULTI_O)
  install:	all
- 	/usr/bin/install -m 755 jconvolver $(DESTDIR)$(PREFIX)/bin
- 	/usr/bin/install -m 755 fconvolver $(DESTDIR)$(PREFIX)/bin
--	/usr/bin/install -m 755 makemulti $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/lib/jconvolver
-+	/usr/bin/install -m 755 makemulti $(DESTDIR)$(PREFIX)/lib/jconvolver
+ 	install -Dm 755 jconvolver $(DESTDIR)$(PREFIX)/bin/jconvolver
+ 	install -Dm 755 fconvolver $(DESTDIR)$(PREFIX)/bin/fconvolver
+-	install -Dm 755 makemulti  $(DESTDIR)$(PREFIX)/bin/makemulti
++	install -d $(DESTDIR)$(PREFIX)/lib/jconvolver
++	install -m 755 makemulti $(DESTDIR)$(PREFIX)/lib/jconvolver
  
  
  clean:

-- 
jconv packaging