[SCM] zita-at1/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 27630c2888226de207f8f32037e963423264d34d
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 17 11:01:18 2011 +0200

    Refresh

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index b1dcc4f..08dec3e 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,10 +1,11 @@
-Description: Create the directory /usr/bin before installing the executable.
+Description: Override PREFIX only if not set.
  Debian-specific: remove suffix from libraries path, set $PREFIX to /usr.
+ Strip -march=native out of CPPFLAGS.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: no
 ---
- source/Makefile |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ source/Makefile |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 --- zita-at1.orig/source/Makefile
 +++ zita-at1/source/Makefile
@@ -14,22 +15,13 @@ Forwarded: no
  
 -PREFIX = /usr/local
 -SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-+PREFIX = /usr
++PREFIX ?= /usr/local
  LIBDIR = lib$(SUFFIX)
  BINDIR = $(PREFIX)/bin
  SHARED = $(PREFIX)/share/zita-at1
- VERSION = 0.2.1
+ VERSION = 0.2.2
  CPPFLAGS += -O2 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
 -CPPFLAGS += -march=native
  
  
  all:	zita-at1
-@@ -35,7 +33,7 @@ ZITA-AT1_O = zita-at1.o styles.o jclient
-              button.o rotary.o tmeter.o retuner.o
- zita-at1:	CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
- zita-at1:	LDLIBS += -lcairo -lclxclient -lclthreads -lzita-resampler -lfftw3f -ljack -lpng -lXft -lX11 -lrt
--zita-at1:	LDFLAGS += -L/usr/X11R6/lib
-+zita-at1:	LDFLAGS += -pthread -L/usr/X11R6/lib
- zita-at1:	$(ZITA-AT1_O) 
- 	g++ $(LDFLAGS) -o $@ $(ZITA-AT1_O) $(LDLIBS)
- $(ZITA-AT1_O):

-- 
zita-at1 packaging