From d2f14e07000e9a5ee418bcbcd34c5ae57bd45590 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 17 Mar 2016 13:48:26 -0500
Subject: merge
 https://launchpadlibrarian.net/213229083/indicator-display_0.1+15.10.20150727-0ubuntu1_0.1+15.10.20150727-0ubuntu2~gcc5.1.diff.gz

---
 debian/changelog | 6 ++++++
 debian/control   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9d66cb6..d2e5b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-display (0.1+15.10.20150727-0ubuntu2~gcc5.1) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 27 Jul 2015 22:57:15 +0000
+
 indicator-display (0.1+15.10.20150727-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]
diff --git a/debian/control b/debian/control
index 4f05f74..87b1bf8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: indicator-display
 Section: misc
 Priority: optional
-Maintainer: Charles Kerr <charles.kerr@canonical.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Charles Kerr <charles.kerr@canonical.com>
 Build-Depends: cmake,
                dbus,
                libglib2.0-dev (>= 2.36),
-- 
cgit v1.2.3