Merge new upstreams and changes from Ubuntu.

* New upstream release.
  ∘ Protect against NULL nodes (LP: #602444)
  ∘ Remove extra warnings and messages
  ∘ Handle not having a session bus better (LP: #598715)
* New upstream release.
  * Block building submenus on separators (LP: #598620)
  * Adding more through JSON support for testing
  * Fixing up value handling in dbusmenu-dumper
* debian/control, debian/libdbusmenu-jsonloader*install: Adding
  two binary packages for the jsonloader test library.

4 files changed, 59 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index c25acb9..bf3ed67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+libdbusmenu (0.3.5-1) unstable; urgency=low
+
+  * 
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 14 Jul 2010 10:19:38 +0200
+
+libdbusmenu (0.3.5-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    ∘ Protect against NULL nodes (LP: #602444)
+    ∘ Remove extra warnings and messages
+    ∘ Handle not having a session bus better (LP: #598715)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 08 Jul 2010 10:24:18 -0500
+
+libdbusmenu (0.3.4-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Block building submenus on separators (LP: #598620)
+    * Adding more through JSON support for testing
+    * Fixing up value handling in dbusmenu-dumper
+  * debian/control, debian/libdbusmenu-jsonloader*install: Adding
+    two binary packages for the jsonloader test library.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 01 Jul 2010 09:00:16 -0500
+
 libdbusmenu (0.3.3-1) unstable; urgency=low
 
   * Merge Ubuntu.
diff --git a/debian/control b/debian/control
index c11bb1c..17ec9bf 100644
--- a/debian/control
+++ b/debian/control
@@ -148,3 +148,31 @@ Description: library for passing menus over DBus - GTK+ version documentation
  .
  This package contains developer documentation for libdbusmenu-gtk.
 
+Package: libdbusmenu-jsonloader1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: library for passing menus over DBus - Test lib
+ 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.
+ .
+ This package contains shared libraries to be by test suites in applications
+ or libraries using dbusmenu.
+
+Package: libdbusmenu-jsonloader-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libdbus-glib-1-dev (>= 0.76),
+         libdbusmenu-glib-dev (= ${binary:Version}),
+         libjson-glib-dev
+Description: library for passing menus over DBus - Test lib
+ 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.
+ .
+ This package contains files that are needed to build test suites in 
+ applications or libraries using dbusmenu.
diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install
new file mode 100644
index 0000000..27c41a5
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-jsonloader/*
+debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader.pc
+debian/tmp/usr/lib/libdbusmenu-jsonloader.a
+debian/tmp/usr/lib/libdbusmenu-jsonloader.so
diff --git a/debian/libdbusmenu-jsonloader1.install b/debian/libdbusmenu-jsonloader1.install
new file mode 100644
index 0000000..bff47f5
--- /dev/null
+++ b/debian/libdbusmenu-jsonloader1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdbusmenu-jsonloader.so.*