[SCM] dvblast/master: Remove patches, integrated upstream

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sat Feb 4 13:26:47 UTC 2017


The following commit has been merged in the master branch:
commit 57ed9b46954ff7e76f6c01497217fd832e2fc96a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Feb 4 14:08:51 2017 +0100

    Remove patches, integrated upstream

diff --git a/debian/patches/honor-LDFLAGS.patch b/debian/patches/honor-LDFLAGS.patch
deleted file mode 100644
index 99b8fbb..0000000
--- a/debian/patches/honor-LDFLAGS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Descrption: Honor LDFLAGS
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2015-11-16
-Forwarded: https://mailman.videolan.org/pipermail/dvblast-devel/2015-November/001577.html
-
-diff --git a/Makefile b/Makefile
-index d10808d..8400e30 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,11 +55,11 @@ all: dvblast dvblastctl
- 
- dvblast: $(OBJ_DVBLAST)
- 	@echo "LINK    $@"
--	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDLIBS_DVBLAST) $(LDLIBS)
-+	$(Q)$(CROSS)$(CC) $(LDFLAGS) -o $@ $(OBJ_DVBLAST) $(LDLIBS_DVBLAST) $(LDLIBS)
- 
- dvblastctl: $(OBJ_DVBLASTCTL)
- 	@echo "LINK    $@"
--	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDLIBS)
-+	$(Q)$(CROSS)$(CC) $(LDFLAGS) -o $@ $(OBJ_DVBLASTCTL) $(LDLIBS)
- 
- clean:
- 	@echo "CLEAN   $(CLEAN_OBJS)"
--- 
-2.6.2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f7ef72f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-honor-LDFLAGS.patch
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index a76261a..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Descrption: Fix spelling of bandwidth
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2015-11-16
-Forwarded: https://mailman.videolan.org/pipermail/dvblast-devel/2015-November/001576.html
-
-diff --git a/dvblast.c b/dvblast.c
-index 70828c1..ca58ce3 100644
---- a/dvblast.c
-+++ b/dvblast.c
-@@ -608,7 +608,7 @@ void usage()
- #endif
- #ifdef HAVE_DVB_SUPPORT
-     msg_Raw( NULL, "  -a --adapter          read packets from a Linux-DVB adapter (typically 0-n)" );
--    msg_Raw( NULL, "  -b --bandwidth        frontend bandwith" );
-+    msg_Raw( NULL, "  -b --bandwidth        frontend bandwidth" );
- #endif
-     msg_Raw( NULL, "  -D --rtp-input        read packets from a multicast address instead of a DVB card" );
- #ifdef HAVE_DVB_SUPPORT
--- 
-2.6.2
-

-- 
dvblast packaging



More information about the pkg-multimedia-commits mailing list