[SCM] dvblast/master: New patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f0447a7081dfb7a9e3f3e2e34914decdae5abc0d
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Nov 16 23:09:09 2015 +0100

    New patches
    
    * Honor LDFLAGS
    * Fix spelling of bandwidth

diff --git a/debian/patches/01_remove_bad_cflags.diff b/debian/patches/01_remove_bad_cflags.diff
deleted file mode 100644
index 1aeebc7..0000000
--- a/debian/patches/01_remove_bad_cflags.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove some unneeded CFLAGS.
-
----
- Makefile |    1 -
- 1 file changed, 1 deletion(-)
-
---- dvblast.orig/Makefile
-+++ dvblast/Makefile
-@@ -4,7 +4,6 @@ TOPDIR = `basename ${PWD}`
- GIT_VER = $(shell git describe --tags --dirty --always 2>/dev/null)
- 
- CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer
--CFLAGS += -g
- CFLAGS += -DVERSION=\"$(VERSION_MAJOR).$(VERSION_MINOR)\"
- CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR)
- CFLAGS += -DVERSION_MINOR=$(VERSION_MINOR)
diff --git a/debian/patches/honor-LDFLAGS.patch b/debian/patches/honor-LDFLAGS.patch
new file mode 100644
index 0000000..99b8fbb
--- /dev/null
+++ b/debian/patches/honor-LDFLAGS.patch
@@ -0,0 +1,26 @@
+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
index f7af606..f7ef72f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-01_remove_bad_cflags.diff
+honor-LDFLAGS.patch
+spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..a76261a
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,21 @@
+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