aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-10-08 09:45:43 -0500
committerTed Gould <ted@gould.cx>2014-10-08 09:45:43 -0500
commitee5d303733ce43ce73e6e2aa465c904c731096b9 (patch)
tree35d789b78ad2af6b9adfaad963c35474ff7436b9 /debian
parent5c7e4c72ea133d8c2aefc4edadf0601ab097f4a9 (diff)
parent726a04ec23d83b986201992adeeb1fef67ad615e (diff)
downloadayatana-indicator-messages-ee5d303733ce43ce73e6e2aa465c904c731096b9.tar.gz
ayatana-indicator-messages-ee5d303733ce43ce73e6e2aa465c904c731096b9.tar.bz2
ayatana-indicator-messages-ee5d303733ce43ce73e6e2aa465c904c731096b9.zip
Merge trunk positions
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog20
-rw-r--r--debian/control1
2 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9f22075..f72b140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+indicator-messages (13.10.1+14.10.20141006-0ubuntu1) utopic; urgency=low
+
+ [ Charles Kerr ]
+ * Move the position of this indicator on the panel. (LP: #1377294)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 06 Oct 2014 17:25:02 +0000
+
+indicator-messages (13.10.1+14.10.20140925-0ubuntu1) utopic; urgency=low
+
+ [ Lars Uebernickel ]
+ * Support X-Ubuntu-SymbolicIcon in desktop files (LP: #1365408)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 25 Sep 2014 14:41:04 +0000
+
+indicator-messages (13.10.1+14.10.20140814.1-0ubuntu2) utopic; urgency=low
+
+ * Add "Multi-Arch: same" to libmessaging-menu0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Sep 2014 11:17:34 +0200
+
indicator-messages (13.10.1+14.10.20140814.1-0ubuntu1) utopic; urgency=low
[ Charles Kerr ]
diff --git a/debian/control b/debian/control
index 8b46af7..5cdba7d 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,7 @@ Description: indicator that collects messages that need a response
Package: libmessaging-menu0
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends},