[med-svn] [libbpp-seq] 06/06: Library transition dealing with bug #791099

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libbpp-seq.

commit d9886b4ad8ecfb287d83f5b207c7993edc265950
Author: Andreas Tille <tille at debian.org>
Date:   Sat Apr 9 08:28:28 2016 +0200

    Library transition dealing with bug #791099
---
 debian/changelog |  2 ++
 debian/control   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c5d3c0..19deed1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ libbpp-seq (2.2.0-1) UNRELEASED; urgency=medium
   * debhelper 9
   * DEP5
   * short dh rules file using d-shlibs
+  * Library transition
+    Closes: #791099
 
  -- Andreas Tille <tille at debian.org>  Sat, 09 Apr 2016 07:55:53 +0200
 
diff --git a/debian/control b/debian/control
index 0666ea5..5bbd869 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Julien Dutheil <julien.dutheil at univ-montp2.fr>,
 Section: science
 Build-Depends: debhelper (>= 9),
                cmake,
+               d-shlibs,
                libbpp-core-dev (>= 2.2.0)
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libbpp-seq.git
@@ -14,7 +15,7 @@ Homepage: http://biopp.univ-montp2.fr/wiki/index.php/Main_Page
 Package: libbpp-seq-dev
 Architecture: any
 Section: libdevel
-Depends: libbpp-seq9 (= ${binary:Version}),
+Depends: libbpp-seq9a5 (= ${binary:Version}),
          ${misc:Depends},
          libbpp-core-dev (>= 2.2.0)
 Description: Bio++ Sequence library development files.
@@ -27,17 +28,16 @@ Description: Bio++ Sequence library development files.
  This package contains the static library and the header files of Bio++
  classes for sequence analysis classes.
 
-Package: libbpp-seq9
+Package: libbpp-seq9a5
 Architecture: any
-<<<<<<< HEAD
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libbpp-core2 (>= 2.1.0)
-=======
-Depends: ${shlibs:Depends}, ${misc:Depends},
-  libbpp-core2 (>= 2.2.0)
->>>>>>> upstream/2.2.0
+         libbpp-core2 (>= 2.2.0)
+Conflicts: libbpp-seq9
+Replaces: libbpp-seq9
 Description: Bio++ Sequence library.
  Bio++ is a set of C++ libraries for Bioinformatics, including sequence
  analysis, phylogenetics, molecular evolution and population genetics.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-seq.git