[libdap] 22/48: Remove old conflict

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit e768cfa22c66e1b01f47679df2ce4ca8c8e207d0
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Dec 21 09:22:26 2012 +0000

    Remove old conflict
---
 debian/changelog | 8 +++++++-
 debian/control   | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 759399a..4e4d743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-libdap (3.11.1-11)  unstable; urgency=low
+libdap (3.11.1-12) unstable; urgency=low
+
+  * libdnet-dev no longer conflicts with libdap-dev. Closes: #694655. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 21 Dec 2012 09:20:52 +0000
+
+libdap (3.11.1-11) unstable; urgency=low
 
   * Fix for gcc-4.7, which is stricter on including prototypes.
     Closes: #672008 
diff --git a/debian/control b/debian/control
index 81ee2f7..48d8ee9 100644
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,6 @@ Description: Binaries for the  libdap Data Access Protocol library
 Package: libdap-dev
 Section: libdevel
 Architecture: any
-Conflicts: libdnet-dev
 Multi-Arch: same
 Depends: libdap11 ( = ${binary:Version} ), libdapserver7 (=${binary:Version}), libdapclient3 (=${binary:Version}) , ${misc:Depends}, libxml2-dev, libcurl4-gnutls-dev, uuid-dev, pkg-config
 Description: Development files (headers and static libraries) for libdap

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git