[proftpd-dfsg] 01/01: Remove hardening test and BD on hardening-includes.

[Hilmar Preuße]

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

hilmar-guest pushed a commit to branch master
in repository proftpd-dfsg.

commit 6996a7d85134c2b0a93f683aa45b92dc2701c5e6
Author: Hilmar Preuße <hille42 at web.de>
Date:   Mon Sep 19 22:35:49 2016 +0200

    Remove hardening test and BD on hardening-includes.
---
 debian/changelog         | 2 ++
 debian/control           | 5 ++---
 debian/control.in        | 3 +--
 debian/proftpd-substvars | 2 +-
 debian/rules             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f6e687..6682a63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ proftpd-dfsg (1.3.5a-2) UNRELEASED; urgency=medium
     with SFTP module (Closes: #809068), large_files_SFTP.diff
   * Apply patch for reproducible build. Thanks to Chris Lamb
     (Closes: #831381).
+  * Remove hardening check in debian/rules, remove BD on
+    hardening-includes (Closes: #836759).
   * Some files created during build were not removed during clean.
 
  -- Mahyuddin Susanto <udienz at gmail.com>  Wed, 24 Aug 2016 15:23:38 -0700
diff --git a/debian/control b/debian/control
index 9333dcb..a158665 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,7 @@ Build-Depends: autotools-dev,
                unixodbc-dev,
                zlib1g-dev,
                libgeoip-dev,
-               libmemcached-dev (>= 0.41),
-               hardening-includes
+               libmemcached-dev (>= 0.41)
 Homepage: http://www.proftpd.org/
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
 Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
@@ -41,7 +40,7 @@ Depends: adduser,
 Conflicts: ftp-server
 Breaks: proftpd (<< 1.3.2)
 Replaces: proftpd (<< 1.3.2)
-Provides: ftp-server, proftpd, proftpd-abi-1.3.5
+Provides: ftp-server, proftpd, proftpd-abi-1.3.5a
 Suggests: openbsd-inetd | inet-superserver,
           openssl,
           proftpd-doc,
diff --git a/debian/control.in b/debian/control.in
index 38e0a63..d004449 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -21,8 +21,7 @@ Build-Depends: autotools-dev,
                unixodbc-dev,
                zlib1g-dev,
                libgeoip-dev,
-               libmemcached-dev (>= 0.41),
-               hardening-includes
+               libmemcached-dev (>= 0.41)
 Homepage: http://www.proftpd.org/
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
 Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
diff --git a/debian/proftpd-substvars b/debian/proftpd-substvars
index f8a9542..a293d80 100644
--- a/debian/proftpd-substvars
+++ b/debian/proftpd-substvars
@@ -1 +1 @@
-proftpd:Depends=proftpd-abi-1.3.5 
+proftpd:Depends=proftpd-abi-1.3.5a 
diff --git a/debian/rules b/debian/rules
index e92be16..bda028a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ install: build
 	dh_prep
 	
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp INSTALL_STRIP="$(INSTALL_STRIP)" install
-	find $(CURDIR)/debian/tmp -type f \( -executable -o -name \*.so\* \) -exec hardening-check {} + || true
+	#find $(CURDIR)/debian/tmp -type f \( -executable -o -name \*.so\* \) -exec hardening-check {} + || true
 
 configure: configure-stamp
 configure-stamp: 

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