aboutsummaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorEvgeni Golov <evgeni@debian.org>2010-07-01 11:29:13 +0200
committerEvgeni Golov <evgeni@debian.org>2010-07-01 11:29:13 +0200
commit983a91c50de70a528edafa6fc05dfa9ffcc13b98 (patch)
tree8da346cb82d9cb9bdf8b6c3500f88839c3c215a9 /debian/changelog
parent5259846f36df1eb4703c56cae6a08a4bd0b4ed15 (diff)
parent6830905830ac78271515c586442a090cf7a0e3ff (diff)
downloadlibdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.tar.gz
libdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.tar.bz2
libdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.zip
Merge Ubuntu.
Preserve Maintainer and Vcs-* fields. From Ubuntu: * New upstream release. * Adding support for menu shortcuts (LP: #591293) * Fixing distcheck of documentation builds * Autogen.sh fix for adding custom prefix (LP: #595565) * Fixing children property name to match spec (LP: #597321) * Merging in Debian branch * debian/control: Switching branch on this branch to be the dbusmenu-team. * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog21
1 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9d34249..091c2d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+libdbusmenu (0.3.3-1) unstable; urgency=low
+
+ * Merge Ubuntu.
+ Preserve Maintainer and Vcs-* fields.
+
+ -- Evgeni Golov <evgeni@debian.org> Thu, 01 Jul 2010 11:28:16 +0200
+
+libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ * Adding support for menu shortcuts (LP: #591293)
+ * Fixing distcheck of documentation builds
+ * Autogen.sh fix for adding custom prefix (LP: #595565)
+ * Fixing children property name to match spec (LP: #597321)
+ * Merging in Debian branch
+ * debian/control: Switching branch on this branch to be the
+ dbusmenu-team.
+ * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 24 Jun 2010 09:32:42 -0500
+
libdbusmenu (0.3.2-1) unstable; urgency=low
* Merge from Ubuntu.