diff -Nru healpix-cxx-3.30.0/debian/changelog healpix-cxx-3.30.0/debian/changelog
--- healpix-cxx-3.30.0/debian/changelog	2017-01-23 11:22:57.000000000 -0600
+++ healpix-cxx-3.30.0/debian/changelog	2017-04-23 20:43:32.000000000 -0500
@@ -1,3 +1,12 @@
+healpix-cxx (3.30.0-6ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable (LP: #1685546).
+  * Revert package rename for g++5 ABI transition, since the affected symbols
+    were not part of the ABI; and Provide: the renamed package for
+    compatibility. These changes can be dropped after the 18.04 release.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 23 Apr 2017 20:43:32 -0500
+
 healpix-cxx (3.30.0-6) unstable; urgency=medium
 
   * Revert "Rename library packages for g++5 ABI transition"
@@ -14,18 +23,41 @@
 
  -- Leo Singer <leo.singer@ligo.org>  Wed, 04 Jan 2017 22:38:15 -0500
 
+healpix-cxx (3.30.0-4ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable (LP: #1644951). Remaining changes:
+    - Rename library packages for g++5 ABI transition.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 25 Nov 2016 21:55:56 -0600
+
 healpix-cxx (3.30.0-4) unstable; urgency=medium
 
   * Move packaging to git
 
  -- Leo Singer <leo.singer@ligo.org>  Wed, 09 Nov 2016 00:38:12 -0500
 
+healpix-cxx (3.30.0-3ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Rename library packages for g++5 ABI transition.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 18 Oct 2016 22:38:01 -0700
+
 healpix-cxx (3.30.0-3) unstable; urgency=medium
 
   * Migrate to automatic debug packages
 
  -- Leo Singer <leo.singer@ligo.org>  Sat, 03 Sep 2016 19:23:27 -0400
 
+healpix-cxx (3.30.0-2ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Rename library packages for g++5 ABI transition.  Debian unfortuantely
+      chose not to transition because this had not been in a stable release,
+      so the delta must be carried until the next upstream soname change.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 09 Jul 2016 23:17:31 -0700
+
 healpix-cxx (3.30.0-2) unstable; urgency=medium
 
   * Change maintainer from Debian Science Team to Debian Astro Team.
@@ -46,6 +78,27 @@
 
  -- Leo Singer <leo.singer@ligo.org>  Thu, 19 May 2016 17:48:47 -0400
 
+healpix-cxx (3.11.2-7.1ubuntu2) yakkety; urgency=medium
+
+  * No-change rebuild for cfitsio soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 29 Apr 2016 18:18:08 +0000
+
+healpix-cxx (3.11.2-7.1ubuntu1) wily; urgency=medium
+
+  * Rename library packages for g++5 ABI transition.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 04 Aug 2015 04:37:28 +0000
+
+healpix-cxx (3.11.2-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Display the progress of check (Closes: #754753)
+  * build-depends on libcfitsio-dev instead of
+    libcfitsio3-dev (Closes: #761710)
+
+ -- YunQiang Su <syq@debian.org>  Mon, 30 Mar 2015 19:13:53 +0800
+
 healpix-cxx (3.11.2-7) unstable; urgency=medium
 
   * Run dh-autoreconf to update config.{sub, guess} and {libtool, aclocal}.m4
@@ -101,3 +154,4 @@
   * Initial release (Closes: #739836, #737271).
 
  -- Leo Singer <leo.singer@ligo.org>  Thu, 23 Jan 2014 09:55:58 -0800
+
diff -Nru healpix-cxx-3.30.0/debian/control healpix-cxx-3.30.0/debian/control
--- healpix-cxx-3.30.0/debian/control	2017-01-23 11:10:11.000000000 -0600
+++ healpix-cxx-3.30.0/debian/control	2017-04-23 20:41:00.000000000 -0500
@@ -1,6 +1,7 @@
 Source: healpix-cxx
 Priority: optional
-Maintainer: Debian Astro Team <debian-astro-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Astro Team <debian-astro-maintainers@lists.alioth.debian.org>
 Uploaders: Leo Singer <leo.singer@ligo.org>
 Homepage: http://healpix.sourceforge.net
 Build-Depends:
@@ -38,6 +39,9 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libhealpix-cxx0v5
+Replaces: libhealpix-cxx0v5
+Provides: libhealpix-cxx0v5
 Description: representation of spherical data - C++ shared library
  HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelization
  of a sphere. As suggested in the name, this pixelization produces a