[nailgun] 03/07: drop Makefile_enable_hardening.patch

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository nailgun.

commit de176f7c96376ea599bb660dbaebc9a6c389ab68
Author: Hideki Yamane <henrich at debian.org>
Date:   Thu Feb 1 21:14:36 2018 +0900

    drop Makefile_enable_hardening.patch
---
 debian/changelog                               |  2 ++
 debian/patches/Makefile_enable_hardening.patch | 28 --------------------------
 debian/patches/series                          |  1 -
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0a5e97..cb89781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 nailgun (0.9.3-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * debian/patches
+    - drop Makefile_enable_hardening.patch: merged upstream
 
  -- Hideki Yamane <henrich at debian.org>  Thu, 01 Feb 2018 21:13:51 +0900
 
diff --git a/debian/patches/Makefile_enable_hardening.patch b/debian/patches/Makefile_enable_hardening.patch
deleted file mode 100644
index eabe8d1..0000000
--- a/debian/patches/Makefile_enable_hardening.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: hardening patch
- Just remove some variables to enable hardening
-Author: Hideki Yamane <henrich at debian.org>
-
----
-Origin: vendor
-Forwarded: https://github.com/martylamb/nailgun/pull/101
-Last-Update: 2017-07-27
-
-Index: nailgun/Makefile
-===================================================================
---- nailgun.orig/Makefile	2013-06-11 18:02:29.576861209 +0900
-+++ nailgun/Makefile	2013-06-11 18:03:31.741051396 +0900
-@@ -7,13 +7,11 @@
- # Your compiler location may vary.
- WIN32_CC=/usr/bin/i586-mingw32msvc-gcc
- 
--CC=gcc
--CFLAGS=-Wall -pedantic -s -O3
- SRCDIR=nailgun-client
- 
- ng: ${SRCDIR}/ng.c
- 	@echo "Building ng client.  To build a Windows binary, type 'make ng.exe'"
--	${CC} ${CFLAGS} -o ng ${SRCDIR}/ng.c
-+	${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng ${SRCDIR}/ng.c
- 
- install: ng
- 	install ng /usr/local/bin
diff --git a/debian/patches/series b/debian/patches/series
index afe6f5c..6d899c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 name_define_as_ng-nailgun_ng.c.patch
-Makefile_enable_hardening.patch
 disable_install_target.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nailgun.git