[SCM] zita-rev1/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7aa535a470e3846e6de5ef51e3cea5effa462399
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 17 11:31:09 2011 +0200

    Refresh patches.

diff --git a/debian/patches/0001-makefile.patch b/debian/patches/0001-makefile.patch
index ab58173..850adbe 100644
--- a/debian/patches/0001-makefile.patch
+++ b/debian/patches/0001-makefile.patch
@@ -1,32 +1,27 @@
 Author: Robin Gareus <robin at 64studio.com>
-Description: Declset PREFIX to /usr.
+Description: Do not override PREFIX if already set.
+ Remove -march=native.
+ Strip SUFFIX from library path.
 Forwarded: not-needed
 ---
- source/Makefile |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ source/Makefile |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 --- zita-rev1.orig/source/Makefile
 +++ zita-rev1/source/Makefile
-@@ -19,20 +19,19 @@
+@@ -19,14 +19,12 @@
  # --------------------------------------------------------------------------
  
  
 -PREFIX = /usr/local
+-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 +PREFIX ?= /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
+ BINDIR = $(PREFIX)/bin
  SHARED = $(PREFIX)/share/zita-rev1
- VERSION = 0.1.1
+ VERSION = 0.2.1
  CPPFLAGS += -O2 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
 -CPPFLAGS += -march=native
  
  
  all:	zita-rev1
- 
- ZITA-REV1_O = zita-rev1.o styles.o jclient.o mainwin.o png2img.o guiclass.o rotary.o reverb.o pareq.o
- zita-rev1:	CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
--zita-rev1:	LDLIBS += -lcairo -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
-+zita-rev1:	LDLIBS += -pthread -lcairo -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
- zita-rev1:	LDFLAGS += -L/usr/X11R6/lib
- zita-rev1:	$(ZITA-REV1_O) 
- 	g++ $(LDFLAGS) -o $@ $(ZITA-REV1_O) $(LDLIBS)

-- 
zita-rev1 packaging