[SCM] jconv/master: Patches refreshed.

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

The following commit has been merged in the master branch:
commit fe21c3d8a76cb93dd10cd8f1f35b66c912e48093
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Feb 26 12:57:09 2014 +0100

    Patches refreshed.

diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index e54e891..6545e71 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -5,9 +5,9 @@ Patch is applied because autotools are not used by upstream author. Patch settin
 
 Index: jconv/source/Makefile
 ===================================================================
---- jconv.orig/source/Makefile	2011-10-28 00:45:57.315273071 +0200
-+++ jconv/source/Makefile	2011-10-28 01:07:59.779238532 +0200
-@@ -19,14 +19,15 @@
+--- jconv.orig/source/Makefile	2014-02-26 12:53:18.755253572 +0100
++++ jconv/source/Makefile	2014-02-26 12:55:09.571951186 +0100
+@@ -19,14 +19,16 @@
  # --------------------------------------------------------------------------------
  
  
@@ -16,12 +16,13 @@ Index: jconv/source/Makefile
 +DESTDIR=
  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.9.2
+ VERSION = 0.9.3
  LDFLAGS += -L$(PREFIX)/$(LIBDIR)
- CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\"
--CPPFLAGS += -march=native
+ CPPFLAGS += -DVERSION=\"$(VERSION)\"
 +CPPFLAGS += -ffast-math -funroll-loops
+ CXXFLAGS += -O3 -Wall -MMD -MP
+-CXXFLAGS += -march=native
++#CXXFLAGS += -march=native
  
  
  all:	jconvolver fconvolver makemulti
diff --git a/debian/patches/makefile2.patch b/debian/patches/makefile2.patch
index 311b30a..68bf92f 100644
--- a/debian/patches/makefile2.patch
+++ b/debian/patches/makefile2.patch
@@ -5,9 +5,9 @@ Patch is applied to prevent possible future clash with other binary
 
 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 @@
+--- jconv.orig/source/Makefile	2014-02-26 12:55:56.950539425 +0100
++++ jconv/source/Makefile	2014-02-26 12:55:56.930540021 +0100
+@@ -61,7 +61,8 @@
  install:	all
  	install -Dm 755 jconvolver $(DESTDIR)$(PREFIX)/bin/jconvolver
  	install -Dm 755 fconvolver $(DESTDIR)$(PREFIX)/bin/fconvolver

-- 
jconv packaging