[geographiclib] 01/01: Apply fix from jessie branch also in master

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository geographiclib.

commit 6474d7afffd3a20f0e8bd51cfc5bed247b5b106a
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Tue Nov 11 19:15:04 2014 +0100

    Apply fix from jessie branch also in master
---
 debian/changelog | 6 ++++++
 debian/control   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f9e736e..13411b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+geographiclib (1.37-3) unstable; urgency=medium
+
+  * Add Conflicts/Replace to libgeographic-dev (Closes: #768216)
+
+ -- Ross Gammon <rossgammon at mail.dk>  Thu, 06 Nov 2014 18:25:05 +0100
+
 geographiclib (1.38-1~exp1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ed7946c..c33612c 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,8 @@ Description: C++ library to solve some geodesic problems -- library
 Package: libgeographic-dev
 Architecture: any
 Section: libdevel
+Conflicts: libgeographiclib-dev
+Replaces: libgeographiclib-dev
 Depends: libgeographic13 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.git