diff options
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/control | 13 |
2 files changed, 20 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 142040d..262c1e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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. @@ -5,6 +11,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 fea73b2..8e2234e 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), @@ -22,8 +21,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 @@ -159,8 +158,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 @@ -170,7 +169,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. |