[proftpd-dfsg] 01/01: call dh_auto_clean instead of manual "make distclean".

Hilmar Preuße hilmar-guest at moszumanska.debian.org
Fri Oct 28 09:09:42 UTC 2016


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 8769554002f971017bf25fd43a82f47163c9c7a2
Author: Hilmar Preuße <hille42 at web.de>
Date:   Fri Oct 28 11:09:22 2016 +0200

    call dh_auto_clean instead of manual "make distclean".
---
 debian/changelog | 5 +++--
 debian/rules     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c6b3e1..8cca6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ proftpd-dfsg (1.3.5a-2) UNRELEASED; urgency=medium
 
   [Hilmar Preuße]
   * Apply patch for ftpasswd.8 (Closes: #774390)
+  * Some files created during build were not removed during clean.
   * Apply patch to allow transfer large files (more than 1 GB)
     with SFTP module (Closes: #809068), large_files_SFTP.diff
   * Apply patch for reproducible build. Thanks to Chris Lamb
@@ -28,8 +29,8 @@ proftpd-dfsg (1.3.5a-2) UNRELEASED; urgency=medium
   * 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
-    - build done by dh_auto_build, instead of manual `make all`
-    (- Some files created during build were not removed during clean.)
+    - build done by dh_auto_build, instead of manual "make all"
+    - call dh_auto_clean instead of manual "make distclean"
 
  -- Mahyuddin Susanto <udienz at gmail.com>  Wed, 24 Aug 2016 15:23:38 -0700
 
diff --git a/debian/rules b/debian/rules
index e2b4a15..b072176 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,10 +86,10 @@ configure-stamp:
 clean: debian/control debian/proftpd-substvars myclean 
 myclean:
 	dh_testdir
+	#[ ! -f $(CURDIR)/Makefile ] || $(MAKE) distclean 
+	dh_auto_clean
 	dh_clean
 	
-	[ ! -f $(CURDIR)/Makefile ] || $(MAKE) distclean 
-	
 	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



More information about the Pkg-proftpd-maintainers mailing list