[SCM] zita-resampler/master: Refreshed patches

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

The following commit has been merged in the master branch:
commit 035627c2b1952c421016231b64125ff736e9cf02
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Jan 28 19:45:02 2012 +0100

    Refreshed patches

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index a3303ea..d4fabb8 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -10,10 +10,12 @@ Forwarded: not-needed
  libs/Makefile |   16 ++++++++--------
  2 files changed, 13 insertions(+), 13 deletions(-)
 
---- zita-resampler.orig/apps/Makefile
-+++ zita-resampler/apps/Makefile
-@@ -19,13 +19,13 @@
- # --------------------------------------------------------------------------
+Index: zita-resampler/apps/Makefile
+===================================================================
+--- zita-resampler.orig/apps/Makefile	2012-01-28 19:16:08.000000000 +0100
++++ zita-resampler/apps/Makefile	2012-01-28 19:27:30.944222543 +0100
+@@ -18,16 +18,16 @@
+ # ----------------------------------------------------------------------------
  
  
 -PREFIX = /usr/local
@@ -21,27 +23,33 @@ Forwarded: not-needed
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 -LIBDIR = lib$(SUFFIX)
 +LIBDIR = lib
- DISTDIR = resample-$(VERSION)
+ DISTDIR = zresample-$(VERSION)
  VERSION = 0.4.0
+ MANDIR = /usr/share/man/man1
 -LDFLAGS += -L$(PREFIX)/$(LIBDIR)
--CPPFLAGS += -O3 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\"
+-CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
 +LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L$(DESTDIR)$(PREFIX)/$(LIBDIR)
-+CPPFLAGS += -O3 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -I$(DESTDIR)$(PREFIX)/include
- #CPPFLAGS += -march=native
++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I$(DESTDIR)$(PREFIX)/include
+ CXXFLAGS += -O3  -ffast-math -Wall
+-CXXFLAGS += -march=native
++#CXXFLAGS += -march=native
  
  
-@@ -41,7 +41,7 @@ $(RESAMPLE_O):
+ all:	zresample zresample.1.gz
+@@ -46,7 +46,7 @@
  
  
- install:	resample
--	install -Dm 755 resample $(DESTDIR)$(PREFIX)/bin/resample
-+	install -Dm 755 resample $(DESTDIR)$(PREFIX)/bin/zita-resampler
+ install:	all
+-	install -Dm 755 zresample $(DESTDIR)$(PREFIX)/bin/zresample
++	install -Dm 755 zresample $(DESTDIR)$(PREFIX)/bin/zita-resampler
+ 	install -Dm 644 zresample.1.gz $(DESTDIR)$(MANDIR)/zresample.1.gz
  
- 
- clean:
---- zita-resampler.orig/libs/Makefile
-+++ zita-resampler/libs/Makefile
-@@ -17,9 +17,9 @@
+ uninstall: 
+Index: zita-resampler/libs/Makefile
+===================================================================
+--- zita-resampler.orig/libs/Makefile	2012-01-28 19:16:08.000000000 +0100
++++ zita-resampler/libs/Makefile	2012-01-28 19:28:27.912505029 +0100
+@@ -20,9 +20,9 @@
  
  # Modify as required.
  #
@@ -51,24 +59,14 @@ Forwarded: not-needed
 -LIBDIR = lib$(SUFFIX)
 +LIBDIR = lib
  
- 
- MAJVERS = 0
-@@ -49,12 +49,12 @@ $(ZITA-RESAMPLER_O):	$(ZITA-RESAMPLER_H)
- 
- 
- install:	$(ZITA-RESAMPLER_MIN)
--	install -d $(PREFIX)/include
--	install -d $(PREFIX)/$(LIBDIR)
--	install -m 644 $(ZITA-RESAMPLER_H) $(PREFIX)/include
--	install -m 755 $(ZITA-RESAMPLER_MIN) $(PREFIX)/$(LIBDIR)
--	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
--	ln -sf $(ZITA-RESAMPLER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-RESAMPLER_SO)
-+	install -d $(DESTDIR)$(PREFIX)/include
-+	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	install -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(PREFIX)/include
-+	install -m 755 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ MAJVERS = 1
+ MINVERS = 1.0
+@@ -57,7 +57,7 @@
+ 	install -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(PREFIX)/include/zita-resampler
+ 	install -m 644 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ 	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-RESAMPLER_SO)
+-	ldconfig
 +	/sbin/ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-RESAMPLER_SO)
- 
  
- clean:
+ uninstall:
+ 	/bin/rm -rf $(DESTDIR)$(PREFIX)/include/zita-resampler

-- 
zita-resampler packaging