diff -Nru libbpp-popgen-2.1.0/debian/changelog libbpp-popgen-2.1.0/debian/changelog
--- libbpp-popgen-2.1.0/debian/changelog	2013-05-24 12:31:23.000000000 +0000
+++ libbpp-popgen-2.1.0/debian/changelog	2016-04-21 17:38:18.000000000 +0000
@@ -1,3 +1,12 @@
+libbpp-popgen (2.1.0-1+rpi1) stretch-staging; urgency=medium
+
+  [Changes taken from 2.1.0-1ubuntu1 by Steve Langasek]
+  * Rename library packages for g++5 ABI transition.
+  [Changes taken from 2.1.0-1ubuntu2 by Iain Lane]
+  * Remove hardcoded dependencies.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 21 Apr 2016 17:37:40 +0000
+
 libbpp-popgen (2.1.0-1) unstable; urgency=low
 
   * Bug fixed and warnings removed.
diff -Nru libbpp-popgen-2.1.0/debian/control libbpp-popgen-2.1.0/debian/control
--- libbpp-popgen-2.1.0/debian/control	2013-05-24 12:31:23.000000000 +0000
+++ libbpp-popgen-2.1.0/debian/control	2015-08-11 16:38:19.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libbpp-popgen
 Section: libs
 Priority: optional
-Maintainer: Loic Dachary <loic@dachary.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Loic Dachary <loic@dachary.org>
 Uploaders: Julien Dutheil <julien.dutheil@univ-montp2.fr>
 Build-Depends: debhelper (>= 5), cmake (>= 2.6),
   libbpp-core-dev (>= 2.1.0), libbpp-seq-dev (>= 2.1.0)
@@ -10,16 +11,17 @@
 Package: libbpp-popgen-dev
 Section: libdevel
 Architecture: any
-Depends: libbpp-popgen6 (= ${binary:Version}), ${misc:Depends},
+Depends: libbpp-popgen6v5 (= ${binary:Version}), ${misc:Depends},
   libbpp-core-dev (>= 2.1.0), libbpp-seq-dev (>= 2.1.0)
 Description: Bio++ Population Genetics library development files.
  Contains the Bio++ classes for population genetics.
 
-Package: libbpp-popgen6
+Package: libbpp-popgen6v5
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-  libbpp-core2 (>= 2.1.0), libbpp-seq9 (>= 2.1.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libbpp-popgen6
+Replaces: libbpp-popgen6
 Description: Bio++ Population Genetics library.
  Contains the Bio++ classes for population genetics.
 
diff -Nru libbpp-popgen-2.1.0/debian/libbpp-popgen6.install libbpp-popgen-2.1.0/debian/libbpp-popgen6.install
--- libbpp-popgen-2.1.0/debian/libbpp-popgen6.install	2013-05-24 12:31:23.000000000 +0000
+++ libbpp-popgen-2.1.0/debian/libbpp-popgen6.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff -Nru libbpp-popgen-2.1.0/debian/libbpp-popgen6v5.install libbpp-popgen-2.1.0/debian/libbpp-popgen6v5.install
--- libbpp-popgen-2.1.0/debian/libbpp-popgen6v5.install	1970-01-01 00:00:00.000000000 +0000
+++ libbpp-popgen-2.1.0/debian/libbpp-popgen6v5.install	2015-08-04 04:42:10.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
diff -Nru libbpp-popgen-2.1.0/debian/libbpp-popgen6v5.lintian-overrides libbpp-popgen-2.1.0/debian/libbpp-popgen6v5.lintian-overrides
--- libbpp-popgen-2.1.0/debian/libbpp-popgen6v5.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ libbpp-popgen-2.1.0/debian/libbpp-popgen6v5.lintian-overrides	2015-08-04 04:42:10.000000000 +0000
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libbpp-popgen6v5: package-name-doesnt-match-sonames libbpp-popgen6