[SCM] jack-capture/master: Drop 03-linking_order.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Dec 6 00:55:36 UTC 2010


The following commit has been merged in the master branch:
commit 5d755b0d001e4ba532270faece17c24197245944
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 6 01:55:20 2010 +0100

    Drop 03-linking_order.patch, applied upstream.

diff --git a/debian/patches/03-linking_order.patch b/debian/patches/03-linking_order.patch
deleted file mode 100644
index 277e0d1..0000000
--- a/debian/patches/03-linking_order.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix linking order to prevent FTBFS with GCC 4.5.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: k.s.matheussen at notam02.no
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- jack-capture.orig/Makefile
-+++ jack-capture/Makefile
-@@ -58,7 +58,7 @@ jack_capture: setformat.c jack_capture.c
- 
- 
- jack_capture_gui2: jack_capture_gui2.cpp
--	$(CPP) $(OPTIMIZE) `pkg-config --libs --cflags gtk+-2.0` jack_capture_gui2.cpp -o jack_capture_gui2
-+	$(CPP) $(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
diff --git a/debian/patches/series b/debian/patches/series
index 6b5d3bf..cbdbb00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-makefile-prefix.patch
 02-makefile-compile-option.patch
-03-linking_order.patch

-- 
jack-capture packaging



More information about the pkg-multimedia-commits mailing list