diff options
| author | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2012-05-11 20:54:56 +0000 |
|---|---|---|
| committer | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2012-05-11 20:54:56 +0000 |
| commit | c406a87b26b1b56127758b16a9f6a59f19a302a5 (patch) | |
| tree | 3a75d9689d484f78bb861ce4dfea7e478dbad9ee | |
| parent | ab6967672f6e245a9ca3fea9eed87f103970b863 (diff) | |
| download | ntp-c406a87b26b1b56127758b16a9f6a59f19a302a5.tar.gz | |
Re-enable crypto support by pointing openssl libdir to multiarch dir.
Also increase libssl-dev build dependency to the first multiarch
version. (closes: #670662)
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@361 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | debian/source.lintian-overrides | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index bfe5187..fa4626c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ntp (1:4.2.6.p5+dfsg-2) UNRELEASED; urgency=low + + * Re-enable crypto support by pointing openssl libdir to multiarch dir. + Also increase libssl-dev build dependency to the first multiarch + version. (closes: #670662) + + -- Peter Eisentraut <petere@debian.org> Fri, 11 May 2012 21:12:27 +0300 + ntp (1:4.2.6.p5+dfsg-1) unstable; urgency=low * New upstream release (closes: #644673) diff --git a/debian/control b/debian/control index a60d42d..5f175fd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Debian NTP Team <pkg-ntp-maintainers@lists.alioth.debian.org> Uploaders: Bdale Garbee <bdale@gag.com>, Peter Eisentraut <petere@debian.org>, Kurt Roeckx <kurt@roeckx.be> -Build-Depends: autotools-dev, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 0.9), autogen (>= 1:5.11) +Build-Depends: autotools-dev, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11) Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev Standards-Version: 3.9.3 Homepage: http://support.ntp.org/ diff --git a/debian/rules b/debian/rules index b2d797b..6effbda 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,8 @@ endif --without-ntpsnmpd \ --disable-local-libopts \ --enable-ntp-signd \ - --disable-dependency-tracking + --disable-dependency-tracking \ + --with-openssl-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) build: build-arch build-indep build-arch: build-stamp diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides new file mode 100644 index 0000000..7215814 --- /dev/null +++ b/debian/source.lintian-overrides @@ -0,0 +1 @@ +build-depends-on-1-revision build-depends: libssl-dev (>= 1.0.0e-1) |