[proftpd-dfsg] 01/01: config.{sub, guess} updated by dh_update_autotools_config.

[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 913f7feba29e20e79b3074cab6c30bbd6ad2429b
Author: Hilmar Preuße <hille42 at web.de>
Date:   Wed Oct 12 22:42:22 2016 +0200

    config.{sub,guess} updated by dh_update_autotools_config.
---
 debian/changelog |  4 +++-
 debian/rules     | 11 +----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64a9a45..63b256a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,9 +23,11 @@ proftpd-dfsg (1.3.5a-2) UNRELEASED; urgency=medium
     place as there is no guarantee that any resources opened for setpwent()
     are used for other getpw{nam,uid}() calls.
     </quote>
-  * Some files created during build were not removed during clean.
   * lintian "W: invalid-short-name-in-dep5-copyright bsd" (BSD-3-clause).
   * Same URL for Vcs-Git & Vcs-Browser in control file.
+  * Some suggestions by Mattia Rizzolo <mattia at debian.org> for debian/rules
+    - Update of config.{sub,guess} is done by dh_update_autotools_config
+    (- 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/rules b/debian/rules
index bda028a..2382237 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,12 +76,7 @@ configure-stamp:
 	dh_testdir
 	
 	# Use current autotools helpers
-	-test -r /usr/share/misc/config.sub && \
-		mv ./config.sub ./config.sub.original && \
-		cp -f /usr/share/misc/config.sub ./config.sub
-	-test -r /usr/share/misc/config.guess && \
-		mv ./config.guess ./config.guess.original && \
-		cp -f /usr/share/misc/config.guess ./config.guess
+	dh_update_autotools_config
 	
 	./configure $(shell dpkg-buildflags --export=configure) $(CONF_ARGS) --with-shared=$(DSOMODS1)$(DSOMODS2)$(DSOMODS3)$(DSOMODS4)
 	
@@ -94,10 +89,6 @@ myclean:
 	
 	[ ! -f $(CURDIR)/Makefile ] || $(MAKE) distclean 
 	
-	# Reset upstream autotools helpers
-	[ ! -f config.sub.original ] || mv -f ./config.sub.original ./config.sub 
-	[ ! -f config.guess.original ] || mv -f ./config.guess.original ./config.guess
-	
 	rm -f debian/files.saved debian/files
 	rm -f $$(find . -type l) $$(find . -name "*~" -o -name "*.o")
 	rm -f $(NAME) config.cache config.log lib/*.a ftpshut Make.rules

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