From dd99a2329cca669bc1b21493a6242b3ada2038a5 Mon Sep 17 00:00:00 2001 From: petere Date: Tue, 29 Nov 2011 05:13:07 +0000 Subject: Re-remove tickadj. The previous method of achieving this by tweaking configure cache variables apparently broke at some point, so this time do it more directly. git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@341 0070b5ef-2f16-0410-befa-9a02bd1d6ddb --- debian/changelog | 5 ++++- debian/rules | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ff28ced..7af1e2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,11 @@ ntp (1:4.2.6.p3+dfsg-2) UNRELEASED; urgency=low on libcap2 * Add sntp-manpage.patch to fix some errors in sntp man page pointed out by lintian + * Re-remove tickadj. The previous method of achieving this by tweaking + configure cache variables apparently broke at some point, so this time + do it more directly. - -- Peter Eisentraut Sun, 27 Nov 2011 21:24:54 +0200 + -- Peter Eisentraut Tue, 29 Nov 2011 07:09:49 +0200 ntp (1:4.2.6.p3+dfsg-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 70e8b44..8f4cd32 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,6 @@ ifeq (hurd, $(DEB_HOST_ARCH_OS)) endif cp /usr/share/misc/config.guess /usr/share/misc/config.sub . ./configure CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \ - ac_cv_var_tick=no ac_cv_var_tickadj=no \ --prefix=/usr \ --enable-all-clocks --enable-parse-clocks --enable-SHM \ --disable-debugging --sysconfdir=/var/lib/ntp \ @@ -57,6 +56,9 @@ install: build-stamp mv debian/ntp/usr/bin/$$file debian/ntp/usr/sbin/$$file || exit; \ done + # don't install tickadj + rm debian/ntp/usr/bin/tickadj + install -D -m 0755 scripts/ntpsweep debian/ntp/usr/bin/ntpsweep install -D -m 0644 debian/ntp.dhcp debian/ntp/etc/dhcp/dhclient-exit-hooks.d/ntp install -D -m 0644 debian/ntpdate.dhcp debian/ntpdate/etc/dhcp/dhclient-exit-hooks.d/ntpdate -- cgit v1.2.3