diff options
-rw-r--r-- | debian/changelog | 4 | ||||
-rwxr-xr-x | debian/rules | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 7af1e2c..ff27149 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,10 @@ ntp (1:4.2.6.p3+dfsg-2) UNRELEASED; urgency=low * 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. + * Explicitly disable building ntpsnmpd and remove man page (closes: + #608542; see also #622819) - -- Peter Eisentraut <petere@debian.org> Tue, 29 Nov 2011 07:09:49 +0200 + -- Peter Eisentraut <petere@debian.org> Tue, 29 Nov 2011 20:24:26 +0200 ntp (1:4.2.6.p3+dfsg-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 8f4cd32..5a3d079 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,7 @@ endif --disable-debugging --sysconfdir=/var/lib/ntp \ --with-sntp=no \ --with-lineeditlibs=edit \ + --without-ntpsnmpd \ --disable-local-libopts \ --enable-ntp-signd \ --disable-dependency-tracking @@ -66,8 +67,8 @@ install: build-stamp install -D -m 0644 debian/ntp.conf debian/ntp/etc/ntp.conf - # remove upstream man pages, which are currently not as nice as ours - rm $(addprefix debian/ntp/usr/share/man/man1/,ntpd.1 ntpdc.1 ntp-keygen.1 ntpq.1) + # remove upstream man pages, which are currently not as nice as ours / ntpsnmpd we don't want + rm $(addprefix debian/ntp/usr/share/man/man1/,ntpd.1 ntpdc.1 ntp-keygen.1 ntpq.1 ntpsnmpd.1) dh_movefiles --sourcedir=debian/ntp |