[SCM] silentjack/master: Drop 01-binutils_gold.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Dec 5 11:48:34 UTC 2010


The following commit has been merged in the master branch:
commit c8bfa07d9b8c13fd992e8fca12189c0e5a53a867
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Dec 5 12:43:43 2010 +0100

    Drop 01-binutils_gold.patch, applied upstream.

diff --git a/debian/patches/01-binutils_gold.patch b/debian/patches/01-binutils_gold.patch
deleted file mode 100644
index 66f837b..0000000
--- a/debian/patches/01-binutils_gold.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Fix FTBFS with binutils-gold.
-Author: Alessio Treglia <alessio at debian.org>
-Bug: https://github.com/njh/silentjack/issues#issue/1
----
- Makefile.am |    3 +--
- Makefile.in |    3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
---- silentjack.orig/Makefile.am
-+++ silentjack/Makefile.am
-@@ -1,8 +1,7 @@
- AUTOMAKE_OPTIONS = foreign
- 
- AM_CFLAGS = -g -Wall @JACK_CFLAGS@
--AM_LDFLAGS = -lm @JACK_LIBS@
- 
- bin_PROGRAMS = silentjack
- silentjack_SOURCES = silentjack.c db.h
--
-+silentjack_LDADD = -lm @JACK_LIBS@
---- silentjack.orig/Makefile.in
-+++ silentjack/Makefile.in
-@@ -126,7 +126,6 @@ target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = foreign
- 
- AM_CFLAGS = -g -Wall @JACK_CFLAGS@
--AM_LDFLAGS = -lm @JACK_LIBS@
- 
- bin_PROGRAMS = silentjack
- silentjack_SOURCES = silentjack.c db.h
-@@ -140,7 +139,7 @@ PROGRAMS = $(bin_PROGRAMS)
- 
- am_silentjack_OBJECTS = silentjack.$(OBJEXT)
- silentjack_OBJECTS = $(am_silentjack_OBJECTS)
--silentjack_LDADD = $(LDADD)
-+silentjack_LDADD = $(LDADD) -lm @JACK_LIBS@
- silentjack_DEPENDENCIES =
- silentjack_LDFLAGS =
- 
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

-- 
silentjack packaging



More information about the pkg-multimedia-commits mailing list