[SCM] jackmeter/master: 01-binutils_gold.patch has been adopted by upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Dec 12 01:47:18 UTC 2010


The following commit has been merged in the master branch:
commit 85bb703156e9228ac060fc54ad44f89577c05e9f
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Dec 12 02:47:04 2010 +0100

    01-binutils_gold.patch has been adopted by upstream.

diff --git a/debian/patches/01-binutils_gold.patch b/debian/patches/01-binutils_gold.patch
deleted file mode 100644
index ff72279..0000000
--- a/debian/patches/01-binutils_gold.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix build failure with binutils-gold.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: https://github.com/njh/jackmeter/issues/issue/1
-Applied-Upstream: https://github.com/njh/jackmeter/commit/71e627f
----
- Makefile.am |    2 +-
- Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- jackmeter.orig/Makefile.am
-+++ jackmeter/Makefile.am
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign
- 
- AM_CFLAGS = -g -Wall @JACK_CFLAGS@
--AM_LDFLAGS = -lm @JACK_LIBS@
-+LIBS = -lm @JACK_LIBS@
- 
- bin_PROGRAMS = jack_meter
- jack_meter_SOURCES = jack_meter.c
---- jackmeter.orig/Makefile.in
-+++ jackmeter/Makefile.in
-@@ -109,7 +109,7 @@ target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
- 
- AM_CFLAGS = -g -Wall @JACK_CFLAGS@
--AM_LDFLAGS = -lm @JACK_LIBS@
-+LIBS = -lm @JACK_LIBS@
- 
- bin_PROGRAMS = jack_meter
- jack_meter_SOURCES = jack_meter.c
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 913fdce..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-binutils_gold.patch

-- 
jackmeter packaging



More information about the pkg-multimedia-commits mailing list