diff -Nru bulletml-0.0.6/debian/changelog bulletml-0.0.6/debian/changelog
--- bulletml-0.0.6/debian/changelog	2015-08-03 07:50:39.000000000 +0000
+++ bulletml-0.0.6/debian/changelog	2015-08-14 17:57:26.000000000 +0000
@@ -1,8 +1,9 @@
-bulletml (0.0.6-6ubuntu1) wily; urgency=medium
+bulletml (0.0.6-6.1) unstable; urgency=medium
 
-  * Rename library packages for g++5 ABI transition.
+  * Non-maintainer upload.
+  * Rename library packages for g++ 5 transition (see #790989)
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 03 Aug 2015 07:50:39 +0000
+ -- Jonathan Wiltshire <jmw@debian.org>  Fri, 14 Aug 2015 18:56:13 +0100
 
 bulletml (0.0.6-6) unstable; urgency=low
 
diff -Nru bulletml-0.0.6/debian/control bulletml-0.0.6/debian/control
--- bulletml-0.0.6/debian/control	2015-08-03 07:50:39.000000000 +0000
+++ bulletml-0.0.6/debian/control	2015-08-14 18:04:58.000000000 +0000
@@ -1,7 +1,6 @@
 Source: bulletml
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders:
   Miriam Ruiz <little_miry@yahoo.es>,
   Peter De Wachter <pdewacht@gmail.com>
@@ -19,7 +18,7 @@
 Package: libbulletml-dev
 Section: libdevel
 Architecture: any
-Depends: libbulletml0d2v5 (= ${binary:Version}), ${misc:Depends}
+Depends: libbulletml0v5 (= ${binary:Version}), ${misc:Depends}
 Description: C++ library to handle BulletML easily - development files
  BulletML is the Bullet Markup Language. BulletML can describe the barrage of
  bullets in shooting games.
@@ -27,13 +26,13 @@
  This package includes the files needed for the development of programs that
  use this library.
 
-Package: libbulletml0d2v5
+Package: libbulletml0v5
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
 Conflicts: libbulletml0d2
 Replaces: libbulletml0d2
+Multi-Arch: same
 Description: C++ library to handle BulletML easily - runtime library
  BulletML is the Bullet Markup Language. BulletML can describe the barrage of
  bullets in shooting games.
diff -Nru bulletml-0.0.6/debian/libbulletml0d2v5.install bulletml-0.0.6/debian/libbulletml0d2v5.install
--- bulletml-0.0.6/debian/libbulletml0d2v5.install	2015-08-03 07:50:39.000000000 +0000
+++ bulletml-0.0.6/debian/libbulletml0d2v5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-src/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}/
diff -Nru bulletml-0.0.6/debian/libbulletml0d2v5.lintian-overrides bulletml-0.0.6/debian/libbulletml0d2v5.lintian-overrides
--- bulletml-0.0.6/debian/libbulletml0d2v5.lintian-overrides	2015-08-03 07:50:39.000000000 +0000
+++ bulletml-0.0.6/debian/libbulletml0d2v5.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# G++5 ABI transition
-libbulletml0d2v5: package-name-doesnt-match-sonames libbulletml0d2
diff -Nru bulletml-0.0.6/debian/libbulletml0v5.install bulletml-0.0.6/debian/libbulletml0v5.install
--- bulletml-0.0.6/debian/libbulletml0v5.install	1970-01-01 00:00:00.000000000 +0000
+++ bulletml-0.0.6/debian/libbulletml0v5.install	2013-07-01 07:37:42.000000000 +0000
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+src/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}/