Merge lp:~michihenning/storage-framework/new-cmake-extras into lp:storage-framework/devel

[Michi Henning]

Updated for new cmake-extras. Replaced debian/control with minimal dummy.

Updated for new cmake-extras. Replaced debian/control with minimal dummy.

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

PASSED: Continuous integration, rev:100
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/228/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1263
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1270
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1053
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1053/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1053
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1053/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1053
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1053/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1053
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1053/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1053
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1053/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1053
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1053/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/228/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-11-08 07:08:47 +0000
+++ CMakeLists.txt	2016-12-12 02:23:31 +0000
@@ -104,7 +104,7 @@
 include(CTest)
 enable_testing()
 
-include(EnableCoverageReport)
+find_package(CoverageReport)
 
 include(GNUInstallDirs)
 

=== modified file 'debian/control'
--- debian/control	2016-11-29 11:14:31 +0000
+++ debian/control	2016-12-12 02:23:31 +0000
@@ -1,111 +1,13 @@
 # This file is autogenerated. DO NOT EDIT!
 #
 # Modifications should be made to ./debian/control.in instead.
-# This file is regenerated automatically in the clean target.
+# This file is regenerated automatically by bileto.
 #
 Source: storage-framework
-Section: libs
-Priority: optional
-Maintainer: Ubuntu Core Developers <[e-mail]>
-Standards-Version: 3.9.6
-Build-Depends: cmake,
-               cmake-extras (>= 0.4),
-               debhelper (>= 9),
-               doxygen,
-               google-mock,
-               libapparmor-dev,
-               libboost-filesystem-dev (>= 1.58) | libboost-filesystem1.58-dev,
-               libboost-system-dev (>= 1.58) | libboost-system1.58-dev,
-               libboost-thread-dev (>= 1.58) | libboost-thread1.58-dev,
-               libglib2.0-dev,
-               libgtest-dev,
-               libonline-accounts-qt-dev,
-               libqtdbustest1-dev,
-               libunity-api-dev,
-               licensecheck | devscripts (<< 2.16.6),
-               lsb-release,
-               python3-dbus,
-               python3-gi,
-               qtbase5-dev,
-               qtbase5-dev-tools,
-               qtdeclarative5-dev,
-Homepage: https://launchpad.net/storage-framework
-# if you don't have have commit access to this branch but would like to upload
-# directly to Ubuntu, don't worry: your changes will be merged back into the
-# upstream branch
-Vcs-Bzr: lp:storage-framework
+
+# DO NOT EDIT THIS FILE. WE REALLY MEAN IT!
 
 Package: libstorage-framework-provider-1-5
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Library for Storage Framework providers
- Server-side runtime support for provider implementations.
-
-Package: libstorage-framework-qt-client-1-0
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client library for the Storage Framework (API v1, soon to be removed)
- Runtime support for storage framework clients.
-
-Package: storage-framework-registry
-Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-#        TODO: should be removed once online accounts is fixed: lp:1643421
-         online-accounts-daemon,
-Description: Registry for the Storage Framework
- DBus service that provides access to provider account information.
-
-Package: libstorage-framework-qt-client-2-0
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         storage-framework-registry
-Description: Client library for the Storage Framework
- Runtime support for storage framework clients.
-
-Package: libstorage-framework-qt-local-client-1-0
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client library for the Storage Framework backed by the local file system
- A version of the client-side API that implements a local
- file system provider. This is intended mainly for testing;
- it allows application code to use the storage framework
- API without requiring use of DBus and cloud service account.
-
-Package: storage-framework-client-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libstorage-framework-qt-client-1-0 (= ${binary:Version}),
-         libstorage-framework-qt-local-client-1-0 (= ${binary:Version}),
-         libstorage-framework-qt-client-2-0 (= ${binary:Version}),
-         qtbase5-dev,
-         ${misc:Depends},
-Description: Header files for the Storage Framework client libraries
- Development C++ headers for the client side API.
-
-Package: storage-framework-provider-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libstorage-framework-provider-1-5 (= ${binary:Version}),
-         libboost-thread-dev (>= 1.58) | libboost-thread1.58-dev,
-         ${misc:Depends},
-Description: Header files for the Storage Framework provider library
- Development C++ headers for the provider API.
+Description:  DO NOT EDIT THIS FILE, IT IS GENERATED FROM control.in
+ DO NOT EDIT THIS FILE

=== modified file 'debian/control.in'
--- debian/control.in	2016-11-29 11:14:31 +0000
+++ debian/control.in	2016-12-12 02:23:31 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 Standards-Version: 3.9.6
 Build-Depends: cmake,
-               cmake-extras (>= 0.4),
+               cmake-extras (>= 0.10),
                debhelper (>= 9),
                doxygen,
                google-mock,