aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-03-17 13:27:12 -0500
committerCharles Kerr <charles.kerr@canonical.com>2016-03-17 13:27:12 -0500
commitb7d7f15ab25708c6ee7a3c22389246e07fd6183d (patch)
tree511830698427696b14c71441815aaead60ffec9b
parent5b6008fa3b5a9b0373b2f03791140ca1fa8dc8de (diff)
downloadayatana-indicator-display-b7d7f15ab25708c6ee7a3c22389246e07fd6183d.tar.gz
ayatana-indicator-display-b7d7f15ab25708c6ee7a3c22389246e07fd6183d.tar.bz2
ayatana-indicator-display-b7d7f15ab25708c6ee7a3c22389246e07fd6183d.zip
sync with lp:~ubuntu-branches/ubuntu/wily/indicator-display/wily/ to pick up 0.1+15.10.20150727-0ubuntu2~gcc5.1
-rw-r--r--.bzr-builddeb/default.conf2
-rw-r--r--debian/changelog6
-rw-r--r--debian/control3
3 files changed, 8 insertions, 3 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
deleted file mode 100644
index 6c96a98..0000000
--- a/.bzr-builddeb/default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[BUILDDEB]
-split = True
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 9de530d..529fa37 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,
cmake-extras (>= 0.4),
dbus,