[lintian] 01/02: d/rules: Use dh7-style build
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 04c636f5b33e95cde5155f952e7865b3658382fc
Author: Niels Thykier <niels@thykier.net>
Date: Mon Jan 18 20:53:29 2016 +0000
d/rules: Use dh7-style build
Signed-off-by: Niels Thykier <niels@thykier.net>
---
debian/changelog | 5 +++++
debian/control | 3 ++-
debian/rules | 53 ++++++++++++++++-------------------------------------
3 files changed, 23 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e58594c..1bb2a71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,11 @@ lintian (2.5.40) UNRELEASED; urgency=medium
+ [JW] Add more corrections.
Thanks to Paul Wise for patch for one of them.
+ * debian/control:
+ + [NT] Add ${perl:Depends} to Depends.
+ * debian/rules:
+ + [NT] Convert to dh7 style build.
+
* lib/Lintian/Check.pm:
+ [JW] Remove work-around for Email::Valid bug (#663663), which is now
fixed even in oldstable.
diff --git a/debian/control b/debian/control
index f023e08..8bc7543 100644
--- a/debian/control
+++ b/debian/control
@@ -103,7 +103,8 @@ Depends: binutils,
perl,
t1utils,
xz-utils,
- ${misc:Depends}
+ ${misc:Depends},
+ ${perl:Depends},
Recommends: dpkg (>= 1.17.14),
perl (>= 5.20) | libautodie-perl (>= 2.18),
libperlio-gzip-perl,
diff --git a/debian/rules b/debian/rules
index 0d0d1b1..c9b2693 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,8 +83,7 @@ generate-docs-stamp: $(docsource)
# Target for updating things on lintian.d.o
rebuild-lintian.debian.org: api-doc generate-docs-stamp
-build-arch build-indep build: build-stamp
-build-stamp: $(neededfiles) generate-docs-stamp $(testtarget) $(po4acheckcfg)
+override_dh_auto_build: $(neededfiles) generate-docs-stamp $(testtarget) $(po4acheckcfg)
dh_testdir
mkdir -p l10n
@@ -93,29 +92,17 @@ build-stamp: $(neededfiles) generate-docs-stamp $(testtarget) $(po4acheckcfg)
# check that the static data about perl core modules is up to date
$(PERL) -ne '/PERL_VERSION=(.+)/ and $$] > $$1 and warn q{*}x60 . qq{\n$(perlprovides) needs an update, please run\n debian/rules refresh-perl-provides\n} . q{*}x60 . qq{\n}' $(perlprovides)
- touch $@
-clean: $(neededfiles)
- @echo .... cleaning ....
- dh_testdir
- dh_testroot
- rm -f runtests build-stamp
- rm -rf doc/lintian.html/ doc/lintian.txt
- rm -rf doc/api.html
+override_dh_clean: $(neededfiles)
+ rm -f runtests
+ rm -rf doc/api.html doc/lintian.html/ doc/lintian.txt
ifneq ($(CLEAN_TEST_WORK_DIR),0)
rm -rf "$(TEST_WORK_DIR)"
endif
- rm -rf man/man1/
- rm -fr l10n/
+ rm -rf man/man1/ l10n/
dh_clean -X "$(TEST_WORK_DIR)"
-binary-indep: $(neededfiles) build
- @echo .... binary-indep ....
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
+override_dh_install:
dh_install
# some manual work
perl -p -i -e 's/my \$$LINTIAN_VERSION;/my \$$LINTIAN_VERSION = q{$(VER)};/;' \
@@ -124,22 +111,14 @@ binary-indep: $(neededfiles) build
install -m 644 doc/lintianrc.example $(tmp)/etc/lintianrc
# Remove the l10n dir, if empty - happens if there are no translations
rmdir --ignore-fail-on-non-empty $(tmp)/usr/share/lintian/l10n
- dh_installdocs
- dh_installchangelogs
- dh_installexamples
- dh_installman
- dh_lintian
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-.PHONY: build binary binary-arch binary-indep clean refresh-perl-provides update-po update-lintian.debian.org generate-docs
+
+override_dh_auto_test: $(testtarget)
+
+%:
+ dh $@
+
+# Messes with our tests and we don't need it.
+override_dh_update_autotools_config:
+
+.PHONY: refresh-perl-provides update-po update-lintian.debian.org generate-docs
.DELETE_ON_ERROR: runtests
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: