[med-svn] [adapterremoval] 01/01: Refresh patches

[Kevin Murray]

This is an automated email from the git hooks/post-receive script.

daube-guest pushed a commit to branch master
in repository adapterremoval.

commit 4a2410e910e6f7faf62cbd01d3269e4ce6affa82
Author: Kevin Murray <kdmfoss at gmail.com>
Date:   Sun Dec 4 09:28:05 2016 +1100

    Refresh patches
---
 debian/changelog               |  3 ++-
 debian/patches/hardening.patch | 24 ------------------------
 debian/patches/series          |  1 -
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be0946a..c3a34e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 adapterremoval (2.2.0-1) UNRELEASED; urgency=medium
 
   [ Kevin Murray ]
-  * New upstream version 2.2.0
+  * New upstream version 2.2.0 (Closes: #846664)
+  * Refresh patches
 
  -- Andreas Tille <tille at debian.org>  Sun, 04 Dec 2016 08:37:16 +1100
 
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
deleted file mode 100644
index 40301d6..0000000
--- a/debian/patches/hardening.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 28 Jul 2016 15:13:14 +0200
-Description: Propagate hardening options
-
---- a/Makefile
-+++ b/Makefile
-@@ -6,7 +6,7 @@
- PREFIX := /usr/local
- 
- # Default compilation flags
--CXXFLAGS := -O3 -ansi -pedantic -Wall -Wextra
-+CXXFLAGS += -O3 -ansi -pedantic -Wall -Wextra
- CXXFLAGS := ${CXXFLAGS} -Wcast-align -Wcast-qual -Wctor-dtor-privacy \
- 	-Wdisabled-optimization -Wformat=2 -Winit-self -Wold-style-cast \
- 	-Woverloaded-virtual -Wredundant-decls -Wsign-promo -Wstrict-overflow=5 \
-@@ -146,7 +146,7 @@ $(BDIR)/%.o: src/%.cc
- # Executable
- build/$(PROG): $(OBJS)
- 	@echo $(COLOR_GREEN)"Linking executable '$@'"$(COLOR_END)
--	$(QUIET) $(CXX) $(CXXFLAGS) $^ ${LIBRARIES} -o $@
-+	$(QUIET) $(CXX) $(CXXFLAGS) $^ ${LIBRARIES} -o $@ ${LDFLAGS}
- 
- # Static library
- build/$(LIBNAME).a: $(LIBOBJS)
diff --git a/debian/patches/series b/debian/patches/series
index bcaa682..3af111a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-hardening.patch
 adapt-benchmarking.patch
 reduce_benchmark_length.patch
 delete_adapterremoval1x_completely.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/adapterremoval.git