diff -Nru freehdl-0.0.8/debian/changelog freehdl-0.0.8/debian/changelog
--- freehdl-0.0.8/debian/changelog	2016-12-08 09:24:35.000000000 +0000
+++ freehdl-0.0.8/debian/changelog	2016-12-26 20:46:51.000000000 +0000
@@ -1,3 +1,12 @@
+freehdl (0.0.8-2.2ubuntu2) zesty; urgency=medium
+
+  * 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.
+    (LP: #1648295)
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 26 Dec 2016 14:46:51 -0600
+
 freehdl (0.0.8-2.2ubuntu1) zesty; urgency=medium
 
   * Merge from Debian. Remaining changes:
diff -Nru freehdl-0.0.8/debian/control freehdl-0.0.8/debian/control
--- freehdl-0.0.8/debian/control	2016-12-08 09:24:35.000000000 +0000
+++ freehdl-0.0.8/debian/control	2016-12-26 20:46:51.000000000 +0000
@@ -19,7 +19,7 @@
 Package: libfreehdl0-dev
 Section: libdevel
 Architecture: any
-Depends: libfreehdl0v5 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libfreehdl0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: VHDL simulator for Linux (development headers)
  This is a free VHDL simulator with these features:
   * Has a graphical waveform viewer.
@@ -29,12 +29,13 @@
  The development headers are needed to compile simulations, not only
  to build freehdl based applications.
 
-Package: libfreehdl0v5
+Package: libfreehdl0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libfreehdl0
-Replaces: libfreehdl0
+Conflicts: libfreehdl0v5
+Replaces: libfreehdl0v5
+Provides: libfreehdl0v5
 Description: VHDL simulator for Linux (shared libraries)
  This is a free VHDL simulator with these features:
   * Has a graphical waveform viewer.
diff -Nru freehdl-0.0.8/debian/libfreehdl0.dirs freehdl-0.0.8/debian/libfreehdl0.dirs
--- freehdl-0.0.8/debian/libfreehdl0.dirs	1970-01-01 00:00:00.000000000 +0000
+++ freehdl-0.0.8/debian/libfreehdl0.dirs	2015-08-03 23:28:49.000000000 +0000
@@ -0,0 +1,3 @@
+usr/lib/freehdl
+usr/share/lintian/overrides
+
diff -Nru freehdl-0.0.8/debian/libfreehdl0.install freehdl-0.0.8/debian/libfreehdl0.install
--- freehdl-0.0.8/debian/libfreehdl0.install	1970-01-01 00:00:00.000000000 +0000
+++ freehdl-0.0.8/debian/libfreehdl0.install	2015-08-03 23:28:49.000000000 +0000
@@ -0,0 +1,3 @@
+usr/lib/*.so.*
+usr/lib/freehdl/*.so.*
+usr/lib/pkgconfig/freehdl.pc
diff -Nru freehdl-0.0.8/debian/libfreehdl0.shlibs freehdl-0.0.8/debian/libfreehdl0.shlibs
--- freehdl-0.0.8/debian/libfreehdl0.shlibs	1970-01-01 00:00:00.000000000 +0000
+++ freehdl-0.0.8/debian/libfreehdl0.shlibs	2016-12-26 20:46:51.000000000 +0000
@@ -0,0 +1,6 @@
+libieee 0 libfreehdl0
+libfreehdl-cdfggen 0 libfreehdl0
+libfreehdl-fire 0 libfreehdl0
+libfreehdl-kernel 0 libfreehdl0
+libfreehdl-std 0 libfreehdl0
+libfreehdl-vaul 0 libfreehdl0
diff -Nru freehdl-0.0.8/debian/libfreehdl0v5.dirs freehdl-0.0.8/debian/libfreehdl0v5.dirs
--- freehdl-0.0.8/debian/libfreehdl0v5.dirs	2015-08-03 23:28:49.000000000 +0000
+++ freehdl-0.0.8/debian/libfreehdl0v5.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-usr/lib/freehdl
-usr/share/lintian/overrides
-
diff -Nru freehdl-0.0.8/debian/libfreehdl0v5.install freehdl-0.0.8/debian/libfreehdl0v5.install
--- freehdl-0.0.8/debian/libfreehdl0v5.install	2015-08-03 23:28:49.000000000 +0000
+++ freehdl-0.0.8/debian/libfreehdl0v5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-usr/lib/*.so.*
-usr/lib/freehdl/*.so.*
-usr/lib/pkgconfig/freehdl.pc
diff -Nru freehdl-0.0.8/debian/libfreehdl0v5.lintian-overrides freehdl-0.0.8/debian/libfreehdl0v5.lintian-overrides
--- freehdl-0.0.8/debian/libfreehdl0v5.lintian-overrides	2015-08-03 23:28:49.000000000 +0000
+++ freehdl-0.0.8/debian/libfreehdl0v5.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# G++5 ABI transition
-libfreehdl0v5: package-name-doesnt-match-sonames libfreehdl0
diff -Nru freehdl-0.0.8/debian/libfreehdl0v5.shlibs freehdl-0.0.8/debian/libfreehdl0v5.shlibs
--- freehdl-0.0.8/debian/libfreehdl0v5.shlibs	2015-08-03 23:28:49.000000000 +0000
+++ freehdl-0.0.8/debian/libfreehdl0v5.shlibs	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-libieee 0 libfreehdl0v5
-libfreehdl-cdfggen 0 libfreehdl0v5
-libfreehdl-fire 0 libfreehdl0v5
-libfreehdl-kernel 0 libfreehdl0v5
-libfreehdl-std 0 libfreehdl0v5
-libfreehdl-vaul 0 libfreehdl0v5
diff -Nru freehdl-0.0.8/debian/rules freehdl-0.0.8/debian/rules
--- freehdl-0.0.8/debian/rules	2016-12-08 09:24:35.000000000 +0000
+++ freehdl-0.0.8/debian/rules	2016-12-26 20:46:51.000000000 +0000
@@ -43,7 +43,7 @@
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	cp -f $(CURDIR)/debian/lintian-overrides $(CURDIR)/debian/libfreehdl0v5/usr/share/lintian/overrides/libfreehdl0v5
+	cp -f $(CURDIR)/debian/lintian-overrides $(CURDIR)/debian/libfreehdl0/usr/share/lintian/overrides/libfreehdl0