[SCM] jconv packaging branch, master, updated. debian/0.8.1-1-21-g64f12d8

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

The following commit has been merged in the master branch:
commit 7d6475258ffa2dbc1ce42fee63b22183b6f77610
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Dec 6 19:26:44 2009 +0100

    Edited patch to build properly

diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 23c0f1b..102efc8 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -1,29 +1,38 @@
-Index: jconv-0.8.1/Makefile
+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-0.8.1.orig/Makefile	2009-03-24 01:48:35.000000000 +0100
-+++ jconv-0.8.1/Makefile	2009-03-24 01:49:01.000000000 +0100
-@@ -14,8 +14,9 @@
+--- jconv.orig/source/Makefile	2009-12-06 03:15:14.000000000 +0100
++++ jconv/source/Makefile	2009-12-06 03:21:49.000000000 +0100
+@@ -14,15 +14,16 @@
  #  along with this program; if not, write to the Free Software
  #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
-+DESTDIR=
- 
+-
 -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 = jconv-$(VERSION)
-@@ -58,9 +59,10 @@
+ DISTDIR = jconvolver-$(VERSION)
+ VERSION = 0.8.4
+ LDFLAGS += -L$(PREFIX)/$(LIBDIR)
+ CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\"
+-#CPPFLAGS += -march=i686 -mtune=pentium4 -msse -msse2 -m3dnow -O3 -ffast-math
++CPPFLAGS += -ffast-math -funroll-loops
++CPPFLAGS += -march=native
+ 
+ 
+ # Uncomment if you use a libsndfile version without support for
+@@ -60,9 +61,9 @@
  
  
- install:	jconv fconv mkwavex
--	/usr/bin/install -m 755 jconv $(PREFIX)/bin
--	/usr/bin/install -m 755 fconv $(PREFIX)/bin
--	/usr/bin/install -m 755 mkwavex $(PREFIX)/bin
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 jconv $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 fconv $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 mkwavex $(DESTDIR)$(PREFIX)/bin
+ 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:

-- 
jconv packaging