diff -Nru openmama-2.2.2.1/debian/changelog openmama-2.2.2.1/debian/changelog
--- openmama-2.2.2.1/debian/changelog	2017-03-25 03:45:17.000000000 -0500
+++ openmama-2.2.2.1/debian/changelog	2017-07-13 01:42:05.000000000 -0500
@@ -1,3 +1,12 @@
+openmama (2.2.2.1-11.1ubuntu1) artful; urgency=medium
+
+  * Merge from Debian Sid (LP: #1704061). Remaining changes:
+    - Revert library package rename, since this was not transitioned in
+      Debian. Keep Conflicts/Replaces against the renamed library; this delta
+      can be dropped once 18.04 releases.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 13 Jul 2017 01:42:05 -0500
+
 openmama (2.2.2.1-11.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -6,6 +15,12 @@
 
  -- Anton Gladky <gladk@debian.org>  Sat, 25 Mar 2017 09:45:17 +0100
 
+openmama (2.2.2.1-11ubuntu1) wily; urgency=medium
+
+  * Rename library packages for g++5 ABI transition.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Tue, 04 Aug 2015 11:34:58 +0100
+
 openmama (2.2.2.1-11) unstable; urgency=medium
 
   * Team upload.
diff -Nru openmama-2.2.2.1/debian/control openmama-2.2.2.1/debian/control
--- openmama-2.2.2.1/debian/control	2017-03-25 03:45:03.000000000 -0500
+++ openmama-2.2.2.1/debian/control	2017-07-13 01:34:34.000000000 -0500
@@ -1,7 +1,8 @@
 Source: openmama
 Section: libs
 Priority: extra
-Maintainer: Daniel Pocock <daniel@pocock.com.au>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Daniel Pocock <daniel@pocock.com.au>
 Build-Depends: debhelper (>= 9.0.0), uuid-dev, flex, libavis-dev, dpkg-dev (>= 1.16.1~), automake, libtool, default-jdk, doxygen, junit, ant, texlive-font-utils, ghostscript, javahelper
 Homepage: http://www.openmama.org
 Standards-Version: 3.9.6
@@ -65,6 +66,8 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libmamaavis0
+Conflicts: libmamacpp0v5
+Replaces: libmamacpp0v5
 Description: message oriented middleware - shared libraries (C++)
  OpenMAMA is a high performance Middleware Agnostic Messaging API that
  provides a consistent abstraction layer over a variety of message
@@ -103,6 +106,8 @@
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libmamda0v5
+Replaces: libmamda0v5
 Description: message oriented middleware - shared libraries
  OpenMAMA is a high performance Middleware Agnostic Messaging API that
  provides a consistent abstraction layer over a variety of message
@@ -142,6 +147,8 @@
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libmamdabook0v5
+Replaces: libmamdabook0v5
 Description: message oriented middleware - shared libraries
  OpenMAMA is a high performance Middleware Agnostic Messaging API that
  provides a consistent abstraction layer over a variety of message
@@ -167,6 +174,8 @@
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libmamdanews0v5
+Replaces: libmamdanews0v5
 Description: message oriented middleware - shared libraries
  OpenMAMA is a high performance Middleware Agnostic Messaging API that
  provides a consistent abstraction layer over a variety of message
@@ -179,6 +188,8 @@
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libmamdaoptions0v5
+Replaces: libmamdaoptions0v5
 Description: message oriented middleware - shared libraries
  OpenMAMA is a high performance Middleware Agnostic Messaging API that
  provides a consistent abstraction layer over a variety of message