[proftpd-dfsg] 01/01: Replace some install calls by entries in .install files.

[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 61a8d2ca23a3a564feff69daa2798534c86b9968
Author: Hilmar Preuße <hille42 at web.de>
Date:   Fri Nov 25 22:53:55 2016 +0100

    Replace some install calls by entries in .install files.
---
 debian/changelog             |  3 ++-
 debian/proftpd-basic.install |  8 +++++++-
 debian/proftpd-dev.install   |  1 +
 debian/rules                 | 17 +++++++----------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 557b7a7..6026034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,10 +32,11 @@ proftpd-dfsg (1.3.5a-2) UNRELEASED; urgency=medium
   * lintian "E: proftpd-dfsg source: build-depends-on-obsolete-package
     build-depends: libmysqlclient-dev => default-libmysqlclient-dev"
   * Same URL for Vcs-Git & Vcs-Browser in control file.
-  * Some suggestions by Mattia Rizzolo <mattia at debian.org> for debian/rules
+  * Some suggestions by Mattia Rizzolo <mattia at debian.org> for d/rules
     - Update of config.{sub,guess} is done by dh_update_autotools_config
     - build done by dh_auto_build, instead of manual "make all"
     - call dh_auto_clean instead of manual "make distclean"
+    - replace some install calls by entries in $package.install files
 
   [1] https://lists.debian.org/debian-devel-announce/2016/11/msg00001.html
 
diff --git a/debian/proftpd-basic.install b/debian/proftpd-basic.install
index b58157f..867e8bd 100644
--- a/debian/proftpd-basic.install
+++ b/debian/proftpd-basic.install
@@ -24,7 +24,7 @@ usr/lib/proftpd/mod_sftp.so
 usr/lib/proftpd/mod_sftp_sql.so
 usr/lib/proftpd/mod_sftp_pam.so
 usr/lib/proftpd/mod_sql.so
-usr/lib/proftpd/mod_sql_passwd.so                                                                                                                           
+usr/lib/proftpd/mod_sql_passwd.so
 usr/lib/proftpd/mod_tls.so
 usr/lib/proftpd/mod_wrap2.so
 usr/lib/proftpd/mod_wrap2_file.so
@@ -36,3 +36,9 @@ usr/lib/proftpd/mod_deflate.so
 usr/lib/proftpd/mod_ifversion.so
 usr/lib/proftpd/mod_tls_memcache.so
 usr/share/locale/*
+debian/proftpd-gencert usr/sbin/
+contrib/ftpasswd usr/sbin/
+contrib/ftpquota usr/sbin/
+debian/templates/ftpusers etc/
+debian/templates/*.conf usr/share/proftpd/templates/
+debian/templates/welcome.msg usr/share/proftpd/templates/
\ No newline at end of file
diff --git a/debian/proftpd-dev.install b/debian/proftpd-dev.install
index 69a10f9..0e27969 100644
--- a/debian/proftpd-dev.install
+++ b/debian/proftpd-dev.install
@@ -2,3 +2,4 @@ usr/bin/prxs
 usr/lib/proftpd/*.a
 usr/include/proftpd/*
 usr/lib/pkgconfig/proftpd.pc usr/share/pkgconfig
+debian/proftpd-substvars usr/share/proftpd/
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index c6c5642..fd83e39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,17 +144,14 @@ binary-arch: checkroot build install
 	rm -f debian/$(PACKAGE)/usr/share/man/man1/ftpasswd.1*
 	# removes proftpd.conf installed by upstream
 	rm -f debian/$(PACKAGE)/etc/$(NAME)/$(NAME).conf
-	
-	install -m 644 debian/templates/*.conf debian/$(PACKAGE)/usr/share/$(NAME)/templates
-	install -m 644 debian/templates/welcome.msg debian/$(PACKAGE)/usr/share/$(NAME)/templates/welcome.msg 
-	install -m 644 debian/templates/ftpusers debian/$(PACKAGE)/etc 
-	install -m 755 debian/$(PACKAGE).init debian/$(PACKAGE)/etc/init.d/$(NAME) 
-	install -m 644 debian/templates/default debian/$(PACKAGE)/etc/default/$(NAME) 
+
+	# The following two lines could be replaced by "dh_installinit -a"
+	# This needs overhaul/cleanup of {pre|post}{install|rm} scripts
+	# as dh_installinit installs own shell snippets.
+	install -m 755 debian/$(PACKAGE).init debian/$(PACKAGE)/etc/init.d/$(NAME)
+	install -m 644 debian/templates/default debian/$(PACKAGE)/etc/default/$(NAME)
+	# Not sure how to put this into a .files entry.
 	install contrib/xferstats.holger-preiss debian/$(PACKAGE)/usr/sbin/ftpstats
-	install -m 755 contrib/ftpasswd debian/$(PACKAGE)/usr/sbin/ftpasswd
-	install -m 755 contrib/ftpquota debian/$(PACKAGE)/usr/sbin/ftpquota
-	install -m 755 debian/proftpd-gencert debian/$(PACKAGE)/usr/sbin/proftpd-gencert
-	install -m 644 debian/proftpd-substvars debian/$(PACKAGE_DEV)/usr/share/$(NAME)/proftpd-substvars
 	
 	dh_installdebconf -a
 	dh_compress -a

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