[SCM] jack-capture/master: Patches refreshed

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

The following commit has been merged in the master branch:
commit 53958c83966d5e9f4e7152dfbda0de6bdf3b23d1
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed May 30 13:46:30 2012 +0200

    Patches refreshed

diff --git a/debian/patches/01-makefile-prefix.patch b/debian/patches/01-makefile-prefix.patch
index a302663..c21cbda 100644
--- a/debian/patches/01-makefile-prefix.patch
+++ b/debian/patches/01-makefile-prefix.patch
@@ -5,13 +5,13 @@ Forwarded: no
  Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- jack-capture.orig/Makefile
-+++ jack-capture/Makefile
-@@ -1,6 +1,6 @@
+Index: jack-capture/Makefile
+===================================================================
+--- jack-capture.orig/Makefile	2012-05-30 13:29:32.000000000 +0200
++++ jack-capture/Makefile	2012-05-30 13:36:02.434078446 +0200
+@@ -1,4 +1,4 @@
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+ bindir = $(PREFIX)/bin
  
- DESTDIR =
--prefix = /usr/local
-+prefix = /usr
- bindir = $(prefix)/bin
- 
- VERSION=0.9.61
+ VERSION=0.9.67
diff --git a/debian/patches/02-makefile-compile-option.patch b/debian/patches/02-makefile-compile-option.patch
index d50bb10..064f3cb 100644
--- a/debian/patches/02-makefile-compile-option.patch
+++ b/debian/patches/02-makefile-compile-option.patch
@@ -6,9 +6,11 @@ Forwarded: no
  Makefile |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- jack-capture.orig/Makefile
-+++ jack-capture/Makefile
-@@ -8,7 +8,7 @@ VERSION=0.9.61
+Index: jack-capture/Makefile
+===================================================================
+--- jack-capture.orig/Makefile	2012-05-30 13:20:12.000000000 +0200
++++ jack-capture/Makefile	2012-05-30 13:26:59.670092621 +0200
+@@ -6,7 +6,7 @@
  CC=gcc
  CPP=g++
  
@@ -16,13 +18,4 @@ Forwarded: no
 +OPTIMIZE=-O2
  #OPTIMIZE=-O0 -g
  
- COMPILEFLAGS=$(OPTIMIZE) -DVERSION=\"$(VERSION)\" -Wall -Wextra -Wno-unused
-@@ -57,7 +57,7 @@ jack_capture: setformat.c jack_capture.c
- 
- 
- jack_capture_gui2: jack_capture_gui2.cpp
--	$(CPP) $(OPTIMIZE) jack_capture_gui2.cpp `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
-+	$(CPP) $(LDFLAGS) $(OPTIMIZE) jack_capture_gui2.cpp `pkg-config --libs --cflags gtk+-2.0` -o jack_capture_gui2
- 
- config_flags: Makefile das_config.h
- 	cat das_config.h |grep COMPILEFLAGS|sed s/\\/\\/COMPILEFLAGS// >config_flags
+ COMPILEFLAGS=$(CFLAGS) $(OPTIMIZE) -DVERSION=\"$(VERSION)\" -Wall -Wextra -Wno-unused
diff --git a/debian/patches/series b/debian/patches/series
index 0fcb607..cbdbb00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-makefile-prefix.patch
 02-makefile-compile-option.patch
-03-replace_xdialog.patch

-- 
jack-capture packaging