aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-10-19 20:22:16 -0400
committerTed Gould <ted@gould.cx>2010-10-19 20:22:16 -0400
commit597ba2a3dec3f77be633c88905f93d7a75604397 (patch)
tree0cff483fbb710bd8da8138f2a6fe5b6e5fbde7b2 /debian
parentfbedfcef12a8d0a92a0c56951d6f9cf0c58b9831 (diff)
parent853fe81d0bab3ba0011a6759026223e96013a762 (diff)
downloadlibayatana-appindicator-597ba2a3dec3f77be633c88905f93d7a75604397.tar.gz
libayatana-appindicator-597ba2a3dec3f77be633c88905f93d7a75604397.tar.bz2
libayatana-appindicator-597ba2a3dec3f77be633c88905f93d7a75604397.zip
Merge with Ubuntu Desktop
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
-rw-r--r--debian/control2
2 files changed, 10 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index 02735ec..1fd1402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,18 @@
-indicator-application (0.2.9-0ubuntu1~ppa2) maverick; urgency=low
-
- * debian/libappindicator0.1-cil.installcligac: Add the 0.1
- policy file.
-
- -- Ted Gould <ted@ubuntu.com> Wed, 22 Sep 2010 11:55:08 -0500
-
-indicator-application (0.2.9-0ubuntu1~ppa1) maverick; urgency=low
+indicator-application (0.2.9-0ubuntu1) maverick; urgency=low
+ [ Ted Gould ]
* New upstream release.
* Fix Mono binding versioning and build (LP: #636132)
* Fix submenus with Glade applications (LP: #608219)
* Add new functions to Mono and Python bindings
+ * debian/libappindicator0.1-cil.installcligac: Add the 0.1
+ policy file.
+
+ [ Didier Roche ]
+ * debian/control:
+ - build with latest libindicator-dev for ABI breakage (LP: #637692)
- -- Ted Gould <ted@ubuntu.com> Wed, 22 Sep 2010 11:18:37 -0500
+ -- Didier Roche <didrocks@ubuntu.com> Wed, 22 Sep 2010 20:01:04 +0200
indicator-application (0.2.8-0ubuntu1) maverick; urgency=low
diff --git a/debian/control b/debian/control
index bfd75b6..87682af 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0),
python-gtk2-dev,
libindicate-dev (>= 0.2.0),
libindicate-gtk-dev (>= 0.2.0),
- libindicator-dev (>= 0.3.5),
+ libindicator-dev (>= 0.3.14),
libdbusmenu-gtk-dev (>= 0.2.2),
libdbusmenu-glib-dev (>= 0.2.2),
cli-common-dev (>= 0.5.7),