[xdmf] 38/38: Prep -2 release, conflicting with libloki-dev

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository xdmf.

commit deb9075c6e309079b307074005fc8eb1e1feb044
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Dec 7 12:52:42 2016 +0000

    Prep -2 release, conflicting with libloki-dev
---
 debian/changelog | 6 ++++--
 debian/control   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c30e80..ae72d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xdmf (3.0+git20160803-2) UNRELEASED; urgency=medium
+xdmf (3.0+git20160803-2) unstable; urgency=medium
 
   * CLose old bug; we're now xmdf3. Closes: #830310
+  * Now at DH_COMPAT=10
+  * Conflict with libloki-dev. Closes: #846565
 
- -- Alastair McKinstry <mckinstry at debian.org>  Fri, 02 Dec 2016 12:31:02 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 07 Dec 2016 12:52:23 +0000
 
 xdmf (3.0+git20160803-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 127259e..a21cbf9 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Description: eXtensible Data Model and Format library
 Package: libxdmf-dev
 Section: libdevel
 Architecture: any
+Conflicts: libloki-dev
 Depends: libxdmf3  (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, libgzstream-dev
 Description: eXtensible Data Model and Format development tools
  This package contains the headers and development tools needed to build

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