diff options
| author | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2011-11-29 05:13:07 +0000 |
|---|---|---|
| committer | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2011-11-29 05:13:07 +0000 |
| commit | dd99a2329cca669bc1b21493a6242b3ada2038a5 (patch) | |
| tree | 25065ee99c9e2aab67c48a71a6a64cea8e75a533 | |
| parent | 7b8d3ce8aa8f35f15972bf6d8885177ada23d83c (diff) | |
| download | ntp-dd99a2329cca669bc1b21493a6242b3ada2038a5.tar.gz | |
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
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | 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 <petere@debian.org> Sun, 27 Nov 2011 21:24:54 +0200 + -- Peter Eisentraut <petere@debian.org> 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 |