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.

1 files changed, 28 insertions, 0 deletions

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.