[pkg-ntp-maintainers] [pkg-ntp] 01/13: Update to debhelper sequencer, compat level 10
Bernhard Schmidt
berni at moszumanska.debian.org
Sun May 7 19:44:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
berni pushed a commit to branch berni-wip
in repository pkg-ntp.
commit ce4140899a9520550cfef4380a66411c8442cca2
Author: Bernhard Schmidt <berni at debian.org>
Date: Wed Mar 15 22:43:25 2017 +0100
Update to debhelper sequencer, compat level 10
---
debian/compat | 2 +-
debian/control | 2 +-
debian/rules | 84 +++++++++-------------------------------------------------
3 files changed, 15 insertions(+), 73 deletions(-)
diff --git a/debian/compat b/debian/compat
index 1e8b314..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+10
diff --git a/debian/control b/debian/control
index 3309b7c..05e5b85 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: Debian NTP Team <pkg-ntp-maintainers at lists.alioth.debian.org>
Uploaders: Peter Eisentraut <petere at debian.org>, Kurt Roeckx <kurt at roeckx.be>, Bernhard Schmidt <berni at debian.org>
-Build-Depends: dh-autoreconf, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11), libopts25-dev (>= 1:5.11), pps-tools [linux-any], dh-apparmor
+Build-Depends: debhelper (>= 10), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11), libopts25-dev (>= 1:5.11), pps-tools [linux-any], dh-apparmor
Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev
Standards-Version: 3.9.5
Homepage: http://support.ntp.org/
diff --git a/debian/rules b/debian/rules
index 039de91..021110f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,14 +8,15 @@ CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -D_GNU_SOURCE
CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -fno-strict-aliasing
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-config.status:
- dh_testdir
+%:
+ dh $@
+
+override_dh_auto_configure:
ifeq (hurd, $(DEB_HOST_ARCH_OS))
# hurd does not provided the system calls needed for ntpd to work.
exit 1
endif
- dh_autoreconf
- ./configure CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
+ dh_auto_configure -- CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
--build=$(DEB_BUILD_GNU_TYPE) \
--host=$(DEB_HOST_GNU_TYPE) \
--prefix=/usr \
@@ -30,31 +31,7 @@ endif
--with-locfile=legacy \
--with-openssl-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) -k distclean
- dh_autoreconf_clean
- rm -f Makefile sntp/Makefile
- dh_clean
-
-install: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+override_dh_install:
# move the administrator programs from /usr/bin to /usr/sbin
for file in ntpdate ntp-wait ntpd ntptime ntp-keygen; do \
mv debian/tmp/usr/bin/$$file debian/tmp/usr/sbin/$$file || exit; \
@@ -84,47 +61,12 @@ install: build-stamp
dh_install
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i
rm -f debian/ntp-doc/usr/share/doc/ntp-doc/html/hints/solaris*
- dh_installexamples -i
- dh_installman -i
- dh_installcron -i
- dh_installlogcheck -i
- dh_installchangelogs -i
- dh_installifupdown -i
- dh_perl -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installman -a
- dh_installinit -pntp --error-handler=installinit_error
- dh_installinit -pntpdate
+
+override_dh_installinit:
+ dh_installinit -pntp --error-handler=installinit_error --no-restart-after-upgrade
+ dh_installinit -pntpdate --no-restart-after-upgrade
dh_apparmor --profile-name=usr.sbin.ntpd -pntp
- dh_installcron -a
- dh_installlogcheck -a
- dh_installchangelogs -a
- dh_installifupdown -a
- dh_perl -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
+
+
+override_dh_auto_test:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ntp/pkg-ntp.git
More information about the pkg-ntp-maintainers
mailing list