summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpetere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb>2010-07-04 04:03:20 +0000
committerpetere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb>2010-07-04 04:03:20 +0000
commitb4727331a9ac2d0783cdd11915fc4007852467bd (patch)
tree3a405911cecc1f47b413b821a19ad3a91ee1adb8
parent9e2a634eed4d5a030d46d86f9c3cd85191244e53 (diff)
downloadntp-b4727331a9ac2d0783cdd11915fc4007852467bd.tar.gz
Removed no longer needed build conflict against libreadline-dev
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@320 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3ebce96..6031906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ntp (1:4.2.6.p1+dfsg-2) UNRELEASED; urgency=low
* Document ntpd -I option and ntp.conf interface command (closes: #506389)
* Fix type in ntpdate man page (closes: #566621)
* Added explanation of options to ntptrace man page (closes: #558289)
+ * Removed no longer needed build conflict against libreadline-dev
[ Kurt Roeckx ]
* Move dhcp exit hooks from /etc/dhcp3/dhclient-enter-hooks.d to
diff --git a/debian/control b/debian/control
index 93dfc05..d0f0e5c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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 | not+linux-gnu, libssl-dev (>= 0.9), autogen
-Build-Conflicts: libavahi-compat-libdnssd-dev, libreadline-dev, libwww-dev, libwww-ssl-dev
+Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev
Standards-Version: 3.8.1
Homepage: http://support.ntp.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ntp/ntp/trunk/