diff -Nru libbpp-phyl-2.1.0/debian/changelog libbpp-phyl-2.1.0/debian/changelog
--- libbpp-phyl-2.1.0/debian/changelog	2013-05-24 12:31:06.000000000 +0000
+++ libbpp-phyl-2.1.0/debian/changelog	2016-04-21 13:15:04.000000000 +0000
@@ -1,3 +1,12 @@
+libbpp-phyl (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-1ubuntu3 by Iain Lane]
+  * And again, drop hardcoded dep.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 21 Apr 2016 11:55:45 +0000
+
 libbpp-phyl (2.1.0-1) unstable; urgency=low
 
   * New RateDistribution classes
diff -Nru libbpp-phyl-2.1.0/debian/control libbpp-phyl-2.1.0/debian/control
--- libbpp-phyl-2.1.0/debian/control	2013-05-24 12:31:06.000000000 +0000
+++ libbpp-phyl-2.1.0/debian/control	2016-04-21 11:54:32.000000000 +0000
@@ -10,16 +10,17 @@
 Package: libbpp-phyl-dev
 Section: libdevel
 Architecture: any
-Depends: libbpp-phyl9 (= ${binary:Version}), ${misc:Depends},
+Depends: libbpp-phyl9v5 (= ${binary:Version}), ${misc:Depends},
   libbpp-seq-dev (>= 2.1.0)
 Description: Bio++ Phylogenetic library development files.
  Contains the Bio++ classes for phylogenetics.
 
-Package: libbpp-phyl9
+Package: libbpp-phyl9v5
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-  libbpp-seq9 (>= 2.1.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libbpp-phyl9
+Replaces: libbpp-phyl9
 Description: Bio++ Phylogenetic library.
  Contains the Bio++ classes for phylogenetics.
 
diff -Nru libbpp-phyl-2.1.0/debian/libbpp-phyl9.install libbpp-phyl-2.1.0/debian/libbpp-phyl9.install
--- libbpp-phyl-2.1.0/debian/libbpp-phyl9.install	2013-05-24 12:31:06.000000000 +0000
+++ libbpp-phyl-2.1.0/debian/libbpp-phyl9.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff -Nru libbpp-phyl-2.1.0/debian/libbpp-phyl9v5.install libbpp-phyl-2.1.0/debian/libbpp-phyl9v5.install
--- libbpp-phyl-2.1.0/debian/libbpp-phyl9v5.install	1970-01-01 00:00:00.000000000 +0000
+++ libbpp-phyl-2.1.0/debian/libbpp-phyl9v5.install	2016-04-21 11:54:32.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
diff -Nru libbpp-phyl-2.1.0/debian/libbpp-phyl9v5.lintian-overrides libbpp-phyl-2.1.0/debian/libbpp-phyl9v5.lintian-overrides
--- libbpp-phyl-2.1.0/debian/libbpp-phyl9v5.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ libbpp-phyl-2.1.0/debian/libbpp-phyl9v5.lintian-overrides	2016-04-21 11:54:32.000000000 +0000
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libbpp-phyl9v5: package-name-doesnt-match-sonames libbpp-phyl9