aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/01-Allow-buildflags-to-be-overridden.patch47
-rw-r--r--debian/patches/01-remove-extra-copyright-file.patch (renamed from debian/patches/02-remove-extra-copyright-file.patch)5
-rw-r--r--debian/patches/series3
4 files changed, 7 insertions, 51 deletions
diff --git a/debian/changelog b/debian/changelog
index 1dd5d96..6e20147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ wavemon (0.7.6-1) UNRELEASED; urgency=low
* d/control: update homepage URL
* d/control: bump Standards-Version to 3.9.5
- No changes required
+ * d/patches: Drop 01-Allow-buildflags-to-be-overridden.patch; applied
+ upstream, rename 02-remove-extra-copyright-file.patch as
+ 01-remove-extra-copyright-file.patch
-- Jonathan McCrohan <jmccrohan@gmail.com> Tue, 18 Dec 2012 22:37:17 +0000
diff --git a/debian/patches/01-Allow-buildflags-to-be-overridden.patch b/debian/patches/01-Allow-buildflags-to-be-overridden.patch
deleted file mode 100644
index 03414ae..0000000
--- a/debian/patches/01-Allow-buildflags-to-be-overridden.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From eeaf8047c61fd8dc2eb12240100a8e18f72a9ace Mon Sep 17 00:00:00 2001
-From: Jonathan McCrohan <jmccrohan@gmail.com>
-Date: Sun, 10 Jun 2012 23:12:44 +0100
-Subject: [PATCH] Allow buildflags to be overridden
-
-Required by Debian debhelper to enable build hardening:
-http://wiki.debian.org/Hardening
-
-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
-Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
----
- Makefile.in | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index b7d8ece..0b27ad7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -8,10 +8,12 @@ datadir = $(datarootdir)/@PACKAGE_NAME@
- exec_perms = 0755
- install-suid-root: exec_perms = 4755
-
--CC = @CC@
--CFLAGS = @CFLAGS@
--DEFS = @DEFS@
--LDLIBS = @LIBS@
-+CC ?= @CC@
-+CFLAGS ?= @CFLAGS@
-+CPPFLAGS ?= @CPPFLAGS@
-+LDFLAGS ?= @LDFLAGS@
-+DEFS ?= @DEFS@
-+LDLIBS ?= @LIBS@
-
- INSTALL = @INSTALL@
- RM = rm -vf
-@@ -23,7 +25,7 @@ OBJS = $(PURESRC:.c=.o)
- DOCS = README NEWS THANKS AUTHORS COPYING ChangeLog
-
- %.o: %.c $(HEADERS)
-- $(CC) $(CFLAGS) $(DEFS) -c -o $@ $<
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
-
- all: @PACKAGE_NAME@
- @PACKAGE_NAME@: $(MAIN) $(OBJS)
---
-1.7.10
-
diff --git a/debian/patches/02-remove-extra-copyright-file.patch b/debian/patches/01-remove-extra-copyright-file.patch
index 3afe515..6a419ac 100644
--- a/debian/patches/02-remove-extra-copyright-file.patch
+++ b/debian/patches/01-remove-extra-copyright-file.patch
@@ -1,12 +1,13 @@
From: Jonathan McCrohan <jmccrohan@gmail.com>
Date: Sun, 10 Jun 2012 00:31:09 +0100
Subject: Remove extra copyright file from Makefile
+Last-Update: 2014-01-25
diff --git a/Makefile.in b/Makefile.in
-index b7d8ece..fceed72 100644
+index 0b27ad7..e48e174 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -20,7 +20,7 @@
+@@ -22,7 +22,7 @@ MAIN = @PACKAGE_NAME@.c
HEADERS = @PACKAGE_NAME@.h llist.h iw_if.h
PURESRC = $(filter-out $(MAIN),$(wildcard *.c))
OBJS = $(PURESRC:.c=.o)
diff --git a/debian/patches/series b/debian/patches/series
index e2c3674..f5eb0a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01-Allow-buildflags-to-be-overridden.patch
-02-remove-extra-copyright-file.patch
+01-remove-extra-copyright-file.patch