aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-23 09:52:09 -0600
committerTed Gould <ted@gould.cx>2010-02-23 09:52:09 -0600
commit8af2c8c7ad133cf7b98040ad0e11088594eb7a37 (patch)
tree2783a63ec0f9b795c5557e75ae1f4ada3fe4639b
parentcbdd6a743bfc3e769db5e94a5a443f733d174c66 (diff)
parentd0087bc21f0468fed2fe6d5e048a449ade2c8070 (diff)
downloadayatana-indicator-application-8af2c8c7ad133cf7b98040ad0e11088594eb7a37.tar.gz
ayatana-indicator-application-8af2c8c7ad133cf7b98040ad0e11088594eb7a37.tar.bz2
ayatana-indicator-application-8af2c8c7ad133cf7b98040ad0e11088594eb7a37.zip
Updating to ubuntu-desktop revision
-rw-r--r--debian/changelog38
-rw-r--r--debian/control2
2 files changed, 39 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5151f6f..1824fbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+indicator-application (0.0.13-0ubuntu7) lucid; urgency=low
+
+ * Backported upstream change to fix menu item sensitivity update,
+ thanks to Jan Arne Petersen (lp: #522151)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 22 Feb 2010 17:49:23 +0100
+
+indicator-application (0.0.13-0ubuntu6) lucid; urgency=low
+
+ * Cherrypick fix to check for a null string as the attention icon
+ * Cherrypick fix to remove the registration of dbus objects (LP: #497870)
+ - lets us drop debian/patches/unregister.patch
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 19 Feb 2010 18:52:40 +0100
+
+indicator-application (0.0.13-0ubuntu5) lucid; urgency=low
+
+ * debian/patches/unregister.patch
+ - Fix to remove the registration of dbus objects (LP: #497870)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 19 Feb 2010 17:55:11 +0100
+
+indicator-application (0.0.13-0ubuntu4) lucid; urgency=low
+
+ * Backport Cody Russell's change to fix rhythmbox crashing on closing
+ (lp: #522942)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 17 Feb 2010 23:13:10 +0100
+
+indicator-application (0.0.13-0ubuntu3) lucid; urgency=low
+
+ * Backport trunk change to fix stock items labels (lp: #520048)
+ * Backport trunk change to fix menus update issues (lp: #521181)
+ * debian/control: updated standards-version
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 16 Feb 2010 16:22:31 +0100
+
indicator-application (0.0.13-0ubuntu3~ppa4) lucid; urgency=low
* Upstream merge
@@ -270,3 +307,4 @@ indicator-application (0.0.1-0ubuntu1) karmic; urgency=low
* Development packaging edition.
-- Robert Collins <robert@canonical.com> Thu, 29 Oct 2009 15:44:14 +1100
+
diff --git a/debian/control b/debian/control
index 8788831..1a68874 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 5.0),
libmono-dev,
libnunit-cil-dev,
libgtk2.0-cil-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: https://launchpad.net/indicator-application
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu