aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog20
-rw-r--r--debian/control13
2 files changed, 26 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index aacfcb6..417559a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,21 @@
+libdbusmenu (0.3.7-1) unstable; urgency=low
+
+ * Merge latest upstream from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org> Thu, 29 Jul 2010 11:53:46 +0200
+
libdbusmenu (0.3.7-0ubuntu1) maverick; urgency=low
* New upstream release.
-- Ken VanDine <ken.vandine@canonical.com> Thu, 22 Jul 2010 21:17:13 +0200
+libdbusmenu (0.3.6-1) unstable; urgency=low
+
+ * Merge new upstream from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org> Sat, 17 Jul 2010 10:47:35 +0200
+
libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low
* New upstream release.
@@ -11,6 +23,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.
diff --git a/debian/control b/debian/control
index 8ffb53c..8e29045 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
Source: libdbusmenu
Section: gnome
Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
Uploaders: Evgeni Golov <evgeni@debian.org>
Build-Depends: debhelper (>= 5.0),
cdbs (>= 0.4.41),
@@ -23,8 +22,8 @@ Build-Depends: debhelper (>= 5.0),
valac
Standards-Version: 3.9.0
Homepage: https://launchpad.net/dbusmenu
-Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian
+Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian
Package: libdbusmenu-glib1
Section: libs
@@ -160,8 +159,8 @@ Description: library for passing menus over DBus - Test lib
create a menu simply without worrying about how it is displayed on the
other side of the bus.
.
- This package contains shared libraries to be by test suites in applications
- or libraries using dbusmenu.
+ This package contains shared libraries to be used by test suites in
+ applications or libraries using dbusmenu.
Package: libdbusmenu-jsonloader-dev
Section: libdevel
@@ -171,7 +170,7 @@ Depends: ${shlibs:Depends},
libdbus-glib-1-dev (>= 0.76),
libdbusmenu-glib-dev (= ${binary:Version}),
libjson-glib-dev
-Description: library for passing menus over DBus - Test lib
+Description: library for passing menus over DBus - Test lib development files
libdbusmenu passes a menu structure across DBus so that a program can
create a menu simply without worrying about how it is displayed on the
other side of the bus.