[Git][debian-proftpd-team/proftpd-mod-clamav][master] 2 commits: clean debian/ruls

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd-mod-clamav


Commits:
48ce24f9 by Hilmar Preuße at 2018-05-03T11:58:19+02:00
clean debian/ruls

- - - - -
487ff215 by Hilmar Preuße at 2018-05-03T11:59:08+02:00
clean debian/rules

- - - - -


3 changed files:

- debian/changelog
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ proftpd-mod-clamav (0.14~rc2-3) UNRELEASED; urgency=medium
   [ Hilmar Preuße ]
   * Remove Depends on clamav, lower to Recommends (Closes: #875891)
     This module can utilize a clamav instance on a remote machine via TCP.
+  * Cleanup d/rules.
+    - Hardening flags are enabled by debhelper in compat=9
+    - do not call w/ --without python-support
+    - whitespace, CR chars
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 02 May 2018 21:53:16 +0200
 


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,25 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-#export DEB_BUILD_HARDENING=1
 export DH_VERBOSE=1
 DPKG_EXPORT_BUILDFLAGS = 1
 MODULE_NAME=mod_clamav
 DEBNAME=proftpd-mod-clamav
-include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@ --without python-support
+	dh $@
 
 override_dh_auto_build:
 	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -c $(MODULE_NAME).c
-        
+
 override_dh_auto_install:
 	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -i -c $(MODULE_NAME).c
 	rm -f $(CURDIR)/debian/$(DEBNAME)/usr/lib/proftpd/*.la \
-	      $(CURDIR)/debian/$(DEBNAME)/usr/lib/proftpd/*.a
+		$(CURDIR)/debian/$(DEBNAME)/usr/lib/proftpd/*.a
 
 override_dh_gencontrol:
 	cat /usr/share/proftpd/proftpd-substvars >> $(CURDIR)/debian/$(DEBNAME).substvars
 	dh_gencontrol
 
 override_dh_auto_clean:
-	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -d $(MODULE_NAME).c
\ No newline at end of file
+	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -d $(MODULE_NAME).c


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/proftpd-mod_clamav-$1\.tar\.gz/ \
-  https://github.com/jbenden/mod_clamav/tags .*/v?(\d\S*)\.tar\.gz
\ No newline at end of file
+  https://github.com/jbenden/mod_clamav/tags .*/v?(\d\S*)\.tar\.gz



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-clamav/compare/1e8065bfe24841f03612025872045179682a85c2...487ff215a820bc9b3940f7d492c0176941f0916e

---
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-clamav/compare/1e8065bfe24841f03612025872045179682a85c2...487ff215a820bc9b3940f7d492c0176941f0916e
You're receiving this email because of your account on salsa.debian.org.