diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-15 12:13:25 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-15 12:13:25 -0500 |
| commit | 08dda9bbebb64ffe4f45f48346b3670dabe1d869 (patch) | |
| tree | cb25021b2fd197c888ee549fc426e59e24549f5d | |
| parent | 706261ee20819eca725498dd8894d845808ca74f (diff) | |
| parent | 267513170831eeff1bc8fa76e5a6c6f56414da8c (diff) | |
| download | libdbusmenu-08dda9bbebb64ffe4f45f48346b3670dabe1d869.tar.gz libdbusmenu-08dda9bbebb64ffe4f45f48346b3670dabe1d869.tar.bz2 libdbusmenu-08dda9bbebb64ffe4f45f48346b3670dabe1d869.zip | |
Merging in Debian branch
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 6 |
2 files changed, 11 insertions, 3 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. diff --git a/debian/control b/debian/control index fea73b2..f1ca7a7 100644 --- a/debian/control +++ b/debian/control @@ -159,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 @@ -170,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. |