aboutsummaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-15 12:13:25 -0500
committerTed Gould <ted@gould.cx>2010-07-15 12:13:25 -0500
commit08dda9bbebb64ffe4f45f48346b3670dabe1d869 (patch)
treecb25021b2fd197c888ee549fc426e59e24549f5d /debian/changelog
parent706261ee20819eca725498dd8894d845808ca74f (diff)
parent267513170831eeff1bc8fa76e5a6c6f56414da8c (diff)
downloadlibdbusmenu-08dda9bbebb64ffe4f45f48346b3670dabe1d869.tar.gz
libdbusmenu-08dda9bbebb64ffe4f45f48346b3670dabe1d869.tar.bz2
libdbusmenu-08dda9bbebb64ffe4f45f48346b3670dabe1d869.zip
Merging in Debian branch
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 142040d..90626ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,14 @@ libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low
-- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 09:42:07 -0500
+libdbusmenu (0.3.5-1) unstable; urgency=low
+
+ * Merge new upstream and changes from Ubuntu.
+ * debian/control:
+ + Add missing "used" to the json package description.
+
+ -- Evgeni Golov <evgeni@debian.org> Wed, 14 Jul 2010 10:21:29 +0200
+
libdbusmenu (0.3.5-0ubuntu1) maverick; urgency=low
* New upstream release.