summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkroeckx <kroeckx@0070b5ef-2f16-0410-befa-9a02bd1d6ddb>2010-07-13 18:08:48 +0000
committerkroeckx <kroeckx@0070b5ef-2f16-0410-befa-9a02bd1d6ddb>2010-07-13 18:08:48 +0000
commit51af273f78e68e17542b37ed10ecb008e21e8250 (patch)
tree3a405911cecc1f47b413b821a19ad3a91ee1adb8
parent8af620fb9ebba919218e7e6c76c50b43057c08b5 (diff)
downloadntp-51af273f78e68e17542b37ed10ecb008e21e8250.tar.gz
Revert r321. pbuilder still doesn't support it.
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@322 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
2 files changed, 2 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index f240986..6031906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,10 +15,8 @@ ntp (1:4.2.6.p1+dfsg-2) UNRELEASED; urgency=low
dhcp3-client (<< 4.1.0-1) (Closes: #585054, #585055)
* Remove ntp's Replaces on logcheck-database, we don't ship log
logcheck entries anymore for ntp.
- * Use architecture wildcards instead of not+linux-gnu for the libcap2-dev
- build dependency (Closes: #528440, #587871)
- -- Kurt Roeckx <kurt@roeckx.be> Sun, 04 Jul 2010 11:04:11 +0200
+ -- Kurt Roeckx <kurt@roeckx.be> Sat, 03 Jul 2010 18:08:41 +0200
ntp (1:4.2.6.p1+dfsg-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b3a21f1..d0f0e5c 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
+Build-Depends: autotools-dev, debhelper (>= 6), libedit-dev, libcap2-dev | not+linux-gnu, libssl-dev (>= 0.9), autogen
Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev
Standards-Version: 3.8.1
Homepage: http://support.ntp.org/