aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-23 00:23:06 -0600
committerTed Gould <ted@gould.cx>2012-02-23 00:23:06 -0600
commit87c4364e84d6647b0f74ce3a8a91c6d46dfceb23 (patch)
tree234fbd48ecfcd15a952107fbdb6f68b34df80646 /debian
parent1474099e50552a8b3fba5c41a705913be8c818cf (diff)
parent55ae52666c1c85127ba6d710ad2e02e0205e736c (diff)
downloadlibayatana-indicator-87c4364e84d6647b0f74ce3a8a91c6d46dfceb23.tar.gz
libayatana-indicator-87c4364e84d6647b0f74ce3a8a91c6d46dfceb23.tar.bz2
libayatana-indicator-87c4364e84d6647b0f74ce3a8a91c6d46dfceb23.zip
Merge with U. Desktop
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog17
-rw-r--r--debian/source/format2
2 files changed, 10 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 54d56a7..2a8ae14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,23 @@
-libindicator (0.4.91-0ubuntu1~ppa3) precise; urgency=low
+libindicator (0.4.91-0ubuntu3) precise; urgency=low
- * Upstream Merge
- * Increasing the test timeout to ensure that's not our issue
+ * Restore revision dropped by error, change to format v1 for that
- -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 21:11:29 -0600
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 15 Feb 2012 13:09:05 +0100
-libindicator (0.4.91-0ubuntu1~ppa2) precise; urgency=low
+libindicator (0.4.91-0ubuntu2) precise; urgency=low
+ * Upstream Merge
+ * Increasing the test timeout to ensure that's not our issue
* debian/rules: Adding messages
- -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 16:48:11 -0600
+ -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 21:11:29 -0600
-libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low
+libindicator (0.4.91-0ubuntu1) precise; urgency=low
* New upstream release.
* Visibility fixes for indicators using that functionality
* Ensure that parent_object is more aggressively set
- * Fix memory leak on groups of items in desktop files
+ * Fix memory leak on groups of items in desktop files (lp: #923629)
* Dropping debian/patches
* Upstream Merge
* Explicitly add in gmodule as a required library
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..d3827e7 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+1.0