aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-08-02 20:51:17 -0500
committerTed Gould <ted@gould.cx>2010-08-02 20:51:17 -0500
commit165de03abfb456cdff28880f6824651cf873e35f (patch)
tree5f9bdc91d980f8f9e41ebba058fee5f2a867fd62
parentd6af8272daa4c4dc09d3ed04a052863688d7b515 (diff)
parentd9fdc575e49d357c425826740e919447c4f1eb24 (diff)
downloadlibdbusmenu-165de03abfb456cdff28880f6824651cf873e35f.tar.gz
libdbusmenu-165de03abfb456cdff28880f6824651cf873e35f.tar.bz2
libdbusmenu-165de03abfb456cdff28880f6824651cf873e35f.zip
Merging the debian branch
-rw-r--r--debian/changelog13
-rw-r--r--debian/control8
2 files changed, 17 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 8a1d63f..ff1a6d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,12 +14,25 @@ libdbusmenu (0.3.8-0ubuntu1) maverick; urgency=low
-- Ken VanDine <ken.vandine@canonical.com> Fri, 30 Jul 2010 13:44:34 -0400
+libdbusmenu (0.3.7-1) unstable; urgency=low
+
+ * Merge latest upstream from Ubuntu.
+ * Standards-Version: 3.9.1
+
+ -- Evgeni Golov <evgeni@debian.org> Thu, 29 Jul 2010 12:00:04 +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-0ubuntu2~ppa1) lucid; urgency=low
* Upstream Merge
diff --git a/debian/control b/debian/control
index 8ffb53c..9fe2dd8 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 5.0),
gir1.0-gtk-2.0,
libx11-dev (>= 1.3),
valac
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
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
@@ -160,8 +160,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 +171,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.