aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-08 09:58:52 -0600
committerTed Gould <ted@gould.cx>2010-02-08 09:58:52 -0600
commitef5c412b6dc596a7f4f071702ebe5a1f797681df (patch)
treef3959072a512ed1729b77e56f88393eb71b88b94
parentc5ba9ddb5872ab6ac640bfd59035d90bfe6b4df2 (diff)
parentb8830e1f10bffec7b3bcdacef125b4cbf5472d01 (diff)
downloadlibayatana-appindicator-ef5c412b6dc596a7f4f071702ebe5a1f797681df.tar.gz
libayatana-appindicator-ef5c412b6dc596a7f4f071702ebe5a1f797681df.tar.bz2
libayatana-appindicator-ef5c412b6dc596a7f4f071702ebe5a1f797681df.zip
Merging in ubuntu-desktop
-rw-r--r--debian/changelog19
-rw-r--r--debian/control6
2 files changed, 17 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 0895ee8..adbf414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,17 +11,28 @@ indicator-application (0.0.12-0ubuntu1~ppa1) UNRELEASED; urgency=low
-- Ted Gould <ted@ubuntu.com> Mon, 08 Feb 2010 09:56:35 -0600
-indicator-application (0.0.11-0ubuntu1~ppa1) lucid; urgency=low
+indicator-application (0.0.11-0ubuntu1) lucid; urgency=low
+ * debian/control:
+ - updated libunit-cil build-depends
+
+ [ Ted Gould ]
* Upstream release 0.0.11
* Interoperability Fixes
* Adding in XVFB support for tests
* Adding support for icons with the '-panel' suffix
* debian/control: Increasing dbusmenu* deps to 0.2.2
- -- Ted Gould <ted@ubuntu.com> Thu, 04 Feb 2010 16:47:46 -0800
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 04 Feb 2010 17:35:19 -0800
+
+indicator-application (0.0.10-0ubuntu2) lucid; urgency=low
+
+ * debian/control
+ - bumped build depends version for libindicator-dev to 0.3.1
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 21 Jan 2010 16:38:18 -0500
-indicator-application (0.0.10-0ubuntu1~ppa1) karmic; urgency=low
+indicator-application (0.0.10-0ubuntu1) lucid; urgency=low
* Upstream release 0.0.10
* Adding in a file to position the indicators
@@ -29,8 +40,6 @@ indicator-application (0.0.10-0ubuntu1~ppa1) karmic; urgency=low
* Use the right callback function for fallback (LP: #507975)
* Support getting the app list from a running service.
* debian/control: Adding dependency for json-glib to build.
- * debian/control: Adjusted back changes in 0.0.9-0ubuntu3 as this
- branch is still on Karmic. Changes are in Lucid.
-- Ted Gould <ted@ubuntu.com> Thu, 21 Jan 2010 14:21:00 -0600
diff --git a/debian/control b/debian/control
index 93e1436..8788831 100644
--- a/debian/control
+++ b/debian/control
@@ -16,15 +16,15 @@ Build-Depends: debhelper (>= 5.0),
python-gtk2-dev,
libindicate-dev (>= 0.2.0),
libindicate-gtk-dev (>= 0.2.0),
- libindicator-dev (>= 0.3.0),
+ libindicator-dev (>= 0.3.1),
libdbusmenu-gtk-dev (>= 0.2.2),
libdbusmenu-glib-dev (>= 0.2.2),
cli-common-dev (>= 0.5.7),
mono-devel (>= 2.0.1),
gtk-sharp2-gapi,
libmono-dev,
- libnunit2.4-cil,
- libgtk2.0-cil
+ libnunit-cil-dev,
+ libgtk2.0-cil-dev
Standards-Version: 3.8.3
Homepage: https://launchpad.net/indicator-application
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu