diff options
author | Ted Gould <ted@gould.cx> | 2011-09-29 14:39:41 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-09-29 14:39:41 -0500 |
commit | 6a1d7639ea8ac4aa5ebdeb89e622b6244b625ab9 (patch) | |
tree | 7accbbd217246a5579948ba42d2586923e520a35 | |
parent | 70c33b0c4c7ce124ac203020f2f3b0a392727577 (diff) | |
parent | b9a57897d1b62553d16ae44fef08801bfb053360 (diff) | |
download | libdbusmenu-6a1d7639ea8ac4aa5ebdeb89e622b6244b625ab9.tar.gz libdbusmenu-6a1d7639ea8ac4aa5ebdeb89e622b6244b625ab9.tar.bz2 libdbusmenu-6a1d7639ea8ac4aa5ebdeb89e622b6244b625ab9.zip |
Merge from Ubuntu Desktop
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | debian/control | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 8e51968..52b1419 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ -libdbusmenu (0.4.94-0ubuntu1~ppa1) oneiric; urgency=low +libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low + [ Ted Gould ] * New upstream release. ∘ Protect functions from NULL submenus (LP: #803667) ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761, LP: #713690, LP: #643871, LP: #713685) - -- Ted Gould <ted@ubuntu.com> Tue, 20 Sep 2011 00:08:19 -0500 + [ Ken VanDine ] + * debian/control + - build dep on valac-0.14 + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 20 Sep 2011 09:16:41 -0700 libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low diff --git a/debian/control b/debian/control index 8ea0aca..2555cd1 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 5.0), gir1.2-gtk-3.0, libx11-dev (>= 1.3), dh-autoreconf, - valac-0.12 + valac-0.14 Standards-Version: 3.9.2 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu |