[Git][debian-proftpd-team/proftpd][master] 4 commits: New dh based debian/rules

Francesco Paolo Lovergine frankie at debian.org
Wed Dec 9 16:01:04 GMT 2020



Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
a29b7512 by Francesco Paolo Lovergine at 2020-12-09T14:18:37+00:00
New dh based debian/rules

- - - - -
8a4cd501 by Francesco Paolo Lovergine at 2020-12-09T15:46:20+01:00
Updated for policy and debhelper

- - - - -
541371f4 by Francesco Paolo Lovergine at 2020-12-09T15:59:53+01:00
Skipping autoreconf

- - - - -
e5f1fd10 by Francesco Paolo Lovergine at 2020-12-09T16:58:10+01:00
Minor changes to debian/control.in file

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
 proftpd-dfsg (1.3.7a-2) UNRELEASED; urgency=medium
 
+  [ Hilmar Preusse ]
   * Applied some patches pulled from upstream.
     - upstream_1063: Avoid segfaults for TLSv1.3 data transfers in
       our session tickey callback by checking the status before using
@@ -32,7 +33,13 @@ proftpd-dfsg (1.3.7a-2) UNRELEASED; urgency=medium
   * Lintian:
     - E: symlink-contains-spurious-segments usr/sbin/in.proftpd ./proftpd
 
- -- Hilmar Preusse <hille42 at web.de>  Thu, 30 Jul 2020 23:16:38 +0200
+  [ Francesco Paolo Lovergine ]
+  * Now using dh methods to modernize debian/rules style. 
+  * Policy bumped to 4.5.1.
+  * Updated debian/control.in to reflect use of a debhelper >= 10.
+  * Fixed a bit the long description to make lintian happy.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 09 Dec 2020 14:17:33 +0000
 
 proftpd-dfsg (1.3.7a-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at alioth-lists.debian.net>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Hilmar Preusse <hille42 at web.de>
-Standards-Version: 4.4.0
-Build-Depends: debhelper (>= 9.20160114),
+Standards-Version: 4.5.1
+Build-Depends: debhelper (>=10),
                dh-exec,
                libacl1-dev,
                libcap-dev [linux-any],
@@ -254,9 +254,9 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
  The proftpd-mod-crypto package carries some proftp modules having to do
  with crypto technologies. These modules are linked with libsodium, which
  is not needed by the main binary:
- - usr/lib/proftpd/mod_sftp.so
- - usr/lib/proftpd/mod_sql_passwd.so
- - usr/lib/proftpd/mod_tls.so
+  - mod_sftp.so
+  - mod_sql_passwd.so
+  - mod_tls.so
 
 Package: proftpd-mod-wrap
 Architecture: any


=====================================
debian/control.in
=====================================
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at alioth-lists.debian.net>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Hilmar Preusse <hille42 at web.de>
-Standards-Version: 4.4.0
-Build-Depends: debhelper (>= 9.20160114),
+Standards-Version: 4.5.1
+Build-Depends: debhelper (>=10),
                dh-exec,
                libacl1-dev,
                libcap-dev [linux-any],
@@ -254,9 +254,9 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
  The proftpd-mod-crypto package carries some proftp modules having to do
  with crypto technologies. These modules are linked with libsodium, which
  is not needed by the main binary:
- - usr/lib/proftpd/mod_sftp.so
- - usr/lib/proftpd/mod_sql_passwd.so
- - usr/lib/proftpd/mod_tls.so
+  - mod_sftp.so
+  - mod_sql_passwd.so
+  - mod_tls.so
 
 Package: proftpd-mod-wrap
 Architecture: any


=====================================
debian/rules
=====================================
@@ -17,17 +17,17 @@ CC := gcc
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
   DEVELOPT=--enable-devel=yes
 endif
+
 ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
 DH_VERBOSE=1
 export DH_VERBOSE
 endif
-#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-#  INSTALL_STRIP=-s
-#endif
 
-#
+ifeq (,$(filter test,$(LOCAL_BUILD_OPTIONS)))
+# Disable automated build tests
+override_dh_auto_test:
+endif
 # dpkg-arch rules
-#
 ifeq (,$(DEB_BUILD_GNU_TYPE))
   include debian/scripts/dpkg-arch.mk
 endif
@@ -66,100 +66,37 @@ debian/control: debian/control.in
 debian/proftpd-substvars: debian/proftpd-substvars.in
 	sed -e 's/@VERSION@/$(VERSION)/' $< >$@
 
-build-arch: build
-build-indep: build
-build: debian/proftpd-substvars configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	dh_auto_build
-
-	touch $@
-
-install: build
-	dh_testdir
-	dh_prep
-	
-	dh_auto_install
-	rm debian/tmp/usr/sbin/in.proftpd
+%:
+	dh $@ --without autoreconf
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	
-	# Use current autotools helpers
+override_dh_auto_configure:
 	dh_update_autotools_config
 	dh_auto_configure -- $(CONF_ARGS) --with-shared=$(DSOMODS1):$(DSOMODS2):$(DSOMODS3):$(DSOMODS4):$(DSOMODS5):$(DSOMODS6)
 
-	touch $@
+override_dh_auto_build: debian/proftpd-substvars
+	dh_auto_build
 
-clean: debian/control debian/proftpd-substvars myclean
-myclean:
-	dh_testdir
+override_dh_auto_install:
+	dh_auto_install
+	rm -f $(CURDIR)/debian/tmp/usr/sbin/in.proftpd
+
+override_dh_auto_clean:
 	dh_auto_clean
-	dh_clean
-	
 	# A few surplus files are removed using debian/clean
 	rm -f $$(find . -type l) $$(find . -name "*~" -o -name "*.orig")
 	rm -rf debian/*.gz core
 
-binary-indep: checkroot build
-	dh_installdirs -i
-	dh_install -i
-	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
-	dh_installexamples -i
-	dh_lintian -i
-	
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_fixperms -i
-	dh_builddeb -i
-
-binary-arch: checkroot build install
-	dh_installdirs -a
-	dh_install -a
-	dh_installdocs -a
-	dh_installchangelogs -a ChangeLog
-	dh_installman -a
-	dh_installlogrotate -a
-	dh_installpam -a --name=$(NAME)
-	dh_link -a
-	dh_lintian -a
-	# removes ftpasswd.1 installed by upstream see #699800
-	rm -f debian/$(PACKAGE)/usr/share/man/man1/ftpasswd.1*
-	# removes proftpd.conf installed by upstream
-	rm -f debian/$(PACKAGE)/etc/$(NAME)/$(NAME).conf
-
-	# Not sure how to put this into a .files entry.
-	# Installed using dh-exec.
-	#install contrib/xferstats.holger-preiss debian/$(PACKAGE)/usr/sbin/ftpstats
-	
-	# TODO: cleanup {pre|post}{install|rm} scripts; remove
-	# --no-scripts statement.
-	#dh_installinit -a --name=proftpd --no-scripts
-	dh_installinit -a --name=proftpd
-	# dh_installdebconf -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_shlibdeps -a
-	dh_installdeb -a
-	dh_perl -a
-	dh_strip -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_fixperms -a
-	dh_builddeb -a
-
-binary:	binary-arch binary-indep
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+override_dh_installpam:
+	dh_installpam --name=$(NAME)
+
+override_dh_installinit:
+	dh_installinit --name=proftpd
 
 checkroot:
 	dh_testdir
 	dh_testroot
 
-.PHONY: binary binary-arch binary-indep clean checkroot myclean install configure debian/proftpd-substvars debian/control
-
-.PHONY: build build-arch build-indep
+.PHONY: checkroot debian/proftpd-substvars debian/control



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/3a8151168cf04654ddb2745206181e2eea72ada1...e5f1fd103412da36b497794d37d771e29146acc8

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/3a8151168cf04654ddb2745206181e2eea72ada1...e5f1fd103412da36b497794d37d771e29146acc8
You're receiving this email because of your account on salsa.debian.org.




More information about the Pkg-proftpd-maintainers mailing list