Merge lp:~ted/ubuntu-app-launch/json-glib-version into lp:ubuntu-app-launch

[Ted Gould]

Removing JSON-GLib version cruft

Remove some cruft after splitting off Vivid

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:266
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/117/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1037/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1044
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/835/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/835
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/835/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/835
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/835/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/835/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/835
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/835/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/835
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/835/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/835/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/835
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/835/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/835
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/835/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/117/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-09-14 21:58:39 +0000
+++ CMakeLists.txt	2016-11-10 00:48:09 +0000
@@ -70,7 +70,7 @@
 pkg_check_modules(GIO2 REQUIRED gio-2.0 gio-unix-2.0)
 include_directories(${GIO2_INCLUDE_DIRS})
 
-pkg_check_modules(JSONGLIB REQUIRED json-glib-1.0)
+pkg_check_modules(JSONGLIB REQUIRED json-glib-1.0>=1.1.2)
 include_directories(${JSONGLIB_INCLUDE_DIRS})
 
 pkg_check_modules(ZEITGEIST REQUIRED zeitgeist-2.0)

=== modified file 'debian/control'
--- debian/control	2016-08-23 15:04:08 +0000
+++ debian/control	2016-11-10 00:48:09 +0000
@@ -17,7 +17,7 @@
                libgirepository1.0-dev,
                libglib2.0-dev,
                libgtest-dev,
-               libjson-glib-dev,
+               libjson-glib-dev (>= 1.1.2),
                liblibertine-dev,
                liblttng-ust-dev,
                libmirclient-dev (>= 0.5),

=== modified file 'libubuntu-app-launch/registry-impl.cpp'
--- libubuntu-app-launch/registry-impl.cpp	2016-09-23 22:30:51 +0000
+++ libubuntu-app-launch/registry-impl.cpp	2016-11-10 00:48:09 +0000
@@ -97,7 +97,6 @@
     }
 }
 
-#if JSON_CHECK_VERSION(1, 1, 2)
 /** Helper function for printing JSON objects to debug output */
 std::string Registry::Impl::printJson(std::shared_ptr<JsonObject> jsonobj)
 {
@@ -122,17 +121,6 @@
 
     return retval;
 }
-#else
-std::string Registry::Impl::printJson(std::shared_ptr<JsonObject> jsonobj)
-{
-    return "Your JSON-GLib is too old to print the JSON here, please talk to your vendor about upgrading";
-}
-
-std::string Registry::Impl::printJson(std::shared_ptr<JsonNode> jsonnode)
-{
-    return "Your JSON-GLib is too old to print the JSON here, please talk to your vendor about upgrading";
-}
-#endif
 
 std::shared_ptr<JsonObject> Registry::Impl::getClickManifest(const std::string& package)
 {