From cff280a531a1af418091e3028a2e713af52f2a75 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 16 Nov 2016 17:09:37 -0800 Subject: [PATCH] use dh $@ and debehlper version 9 --- Makefile | 8 ++---- debian/changelog | 2 ++ debian/compat | 2 +- debian/control | 6 ++-- debian/rules | 74 +++--------------------------------------------- 5 files changed, 14 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile index 3e48fc1..8114d0b 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ PERL ?= /usr/bin/perl # Some tests need to run under an UTF-8 locale. UTF8_LOCALE ?= C.UTF-8 -all: build test +all: build build: $(PERL) Makefile.PL @@ -49,10 +49,8 @@ clean: install: install_mostfiles # install basic debbugs documentation - $(install_data) COPYING UPGRADE README debian/README.mail $(doc_dir) - - # configure debbugs - $(sbin_dir)/debbugsconfig + $(install_data) COPYING UPGRADE README.md debian/README.mail $(doc_dir) + $(MAKE) -f Makefile.perl install DESTDIR=$(DESTDIR) install_mostfiles: # create the directories if they aren't there diff --git a/debian/changelog b/debian/changelog index 6cdffa4..42d7cee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ debbugs (2.6.0~exp1) UNRELEASED; urgency=low #836613). * Fix clone removing all other blocks instead of adding them (Closes: #820044). Thanks to James Clarke. + * Use a supported version of debhelper and switch to dh $@ style rules + (Closes: #800287) [ Niels Thykier ] * quitcgi() now returns 400/500 status codes instead of 200 (Closes: #584922) diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 6fdf7fb..964b0de 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Colin Watson , Don Armstrong Standards-Version: 3.9.4 Vcs-Browser: http://bugs.debian.org/debbugs-source/mainline Vcs-Git: http://bugs.debian.org/debbugs-source/debbugs.git -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 9) Build-Depends-Indep: libparams-validate-perl, libmailtools-perl, libmime-tools-perl, libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl, libcgi-simple-perl, @@ -24,7 +24,7 @@ Depends: ${perl:Depends}, ${misc:Depends}, exim4 | mail-transport-agent, - libdebbugs-perl, + libdebbugs-perl Recommends: debbugs-web Suggests: spamassassin (>= 3.0), libcgi-alert-perl Description: bug tracking system based on the active Debian BTS @@ -63,6 +63,7 @@ Description: modules used by the active Debian BTS Package: debbugs-web Architecture: all Depends: + ${perl:Depends}, ${misc:Depends}, libdebbugs-perl, apache2 | httpd Suggests: libcgi-alert-perl, libapache2-mod-perl2 @@ -78,6 +79,7 @@ Description: web scripts for the active Debian BTS Package: debbugs-local Architecture: all Depends: + ${perl:Depends}, ${misc:Depends}, libdebbugs-perl, debbugs-web, libconfig-simple-perl, libuser-perl, rsync, libhttp-server-simple-perl, libnet-server-perl diff --git a/debian/rules b/debian/rules index 7bdd341..75d02ac 100755 --- a/debian/rules +++ b/debian/rules @@ -1,73 +1,7 @@ #!/usr/bin/make -f -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Some lines taken from debmake, by Cristoph Lameter. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ --parallel -DEST_DIR := $(CURDIR)/debian/tmp -PERL ?= /usr/bin/perl - - -build: build-arch build-indep - -build-arch: -# nothing to do, as there aren't any architecture-dependent packages - -build-indep: build-stamp - -build-stamp: -# Call the test suite - $(PERL) Makefile.PL INSTALLDIRS=vendor - $(MAKE) -f Makefile.perl - $(MAKE) test - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f *-stamp; - if [ -e Makefile.perl ]; then \ - $(MAKE) -f Makefile.perl clean; \ - fi; - #something to remove all trace and *.trace files? - rm -f debbugs.trace Makefile.perl.old - dh_clean - -install: install-stamp -install-stamp: build - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) install_mostfiles DESTDIR=$(DEST_DIR) - $(MAKE) -f Makefile.perl install DESTDIR=$(DEST_DIR) - touch $@ - -binary-arch: -# nothing to do, as there aren't any architecture-dependent packages - -binary-indep: build install - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) install_mostfiles DESTDIR=$(DEST_DIR) - $(MAKE) -f Makefile.perl install DESTDIR=$(DEST_DIR) - dh_install --sourcedir=debian/tmp --fail-missing - dh_installdocs - dh_installchangelogs - dh_strip - dh_fixperms - #chown bugs.bugs $(var_dir)/spool/incoming - dh_installdeb - dh_perl - dh_compress -X examples/text - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - - -binary: binary-indep binary-arch -.PHONY: build clean install binary-indep binary-arch binary +override_dh_auto_install: + dh_auto_install -- INSTALLDIRS=vendor -- 2.39.2