Merge lp:~michihenning/thumbnailer/fix-qt-pkg-config into lp:thumbnailer

[Michi Henning]

* Changed copyright from GPL to LGPL for two files used in storage framework.
* Fixed pkgconfig file for qt library.

* Changed copyright from GPL to LGPL for two files used in storage framework.
* Fixed pkgconfig file for qt library.

[James Henstridge (jamesh)]

Looks good.

review: Approve

[lp:~michihenning/thumbnailer/fix-qt-pkg-config]

147. By Michi Henning on 2016-07-19

merged:
  James Henstridge 2016-07-18 Fix typo introduced when cleaning up CMake files.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-17 01:46:29 +0000
+++ CMakeLists.txt	2016-07-19 01:10:03 +0000
@@ -4,11 +4,11 @@
     set(LOCAL_INSTALL "ON")
 endif()
 
-project(thumbnailer C CXX)
+cmake_minimum_required(VERSION 3.0.2)
+project(thumbnailer VERSION "2.4.0" LANGUAGES C CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-cmake_minimum_required(VERSION 2.8.11)
 
 # Suppress complaints by cmake about COMPILE_DEFINITIONS_<Config> caused by qt5 cmake macros.
 cmake_policy(SET CMP0043 OLD)
@@ -47,18 +47,15 @@
 
 add_definitions(-DQT_NO_KEYWORDS)
 
+include(GNUInstallDirs)
+
 # libthumbnailer-qt version
 set(LIBTHUMBNAILER_QT thumbnailer-qt)
 set(LIBTHUMBNAILER_QT_SO_VERSION_MAJOR "1")
 set(LIBTHUMBNAILER_QT_SO_VERSION_MINOR "0")
 set(LIBTHUMBNAILER_QT_SO_VERSION_MICRO "0")
 set(LIBTHUMBNAILER_QT_SO_VERSION ${LIBTHUMBNAILER_QT_SO_VERSION_MAJOR}.${LIBTHUMBNAILER_QT_SO_VERSION_MINOR})
-set(LIBTHUMBNAILER_QT_HDR_INSTALL_DIR include/${LIBTHUMBNAILER_QT}-${LIBTHUMBNAILER_QT_SO_VERSION}/unity/thumbnailer/qt)
-
-# thumbnailer-service version
-set(THUMBNAILER_VERSION_MAJOR "2")
-set(THUMBNAILER_VERSION_MINOR "4")
-set(THUMBNAILER_VERSION_MICRO "0")
+set(LIBTHUMBNAILER_QT_HDR_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${LIBTHUMBNAILER_QT}-${LIBTHUMBNAILER_QT_SO_VERSION})
 
 # Encoding version of cache files
 set(THUMBNAILER_CACHE_VERSION "2")
@@ -106,16 +103,16 @@
 
 include(cmake/UseGSettings.cmake)
 
-include(GNUInstallDirs)
-set(LIBDIR ${CMAKE_INSTALL_LIBDIR})
 set(SHARE_PRIV_DIR ${CMAKE_INSTALL_LIBDIR}/thumbnailer)
-set(SHARE_PRIV_ABS ${CMAKE_INSTALL_PREFIX}/${SHARE_PRIV_DIR})
+set(SHARE_PRIV_ABS ${CMAKE_INSTALL_FULL_LIBDIR}/thumbnailer)
 
 find_package(Boost COMPONENTS filesystem iostreams regex system REQUIRED)
 find_package(Threads REQUIRED)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(Qt5Gui REQUIRED)
+find_package(Qt5Qml REQUIRED)
+find_package(Qt5Quick REQUIRED)
 
 include(FindPkgConfig)
 pkg_check_modules(GST_DEPS REQUIRED gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-tag-1.0)

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-30 11:07:33 +0000
+++ debian/changelog	2016-07-19 01:10:03 +0000
@@ -1,3 +1,13 @@
+thumbnailer (2.4+16.10.20160530.3-0ubuntu3) UNRELEASED; urgency=medium
+
+  [ Michi Henning ]
+  * Changed copyright from GPL to LGPL for two files used in storage framework.
+
+  [ James Henstridge ]
+  * Fixed pkgconfig file for qt library.
+
+ -- Michi Henning <[e-mail]>  Wed, 13 Jul 2016 16:40:46 +1000
+
 thumbnailer (2.4+16.10.20160530.3-0ubuntu1) yakkety; urgency=medium
 
   [ Michi Henning ]

=== modified file 'include/internal/version.h.in'
--- include/internal/version.h.in	2016-02-15 06:51:18 +0000
+++ include/internal/version.h.in	2016-07-19 01:10:03 +0000
@@ -30,9 +30,9 @@
 {
 
 // Software release version.
-#define THUMBNAILER_VERSION_MAJOR @THUMBNAILER_VERSION_MAJOR@
-#define THUMBNAILER_VERSION_MINOR @THUMBNAILER_VERSION_MINOR@
-#define THUMBNAILER_VERSION_MICRO @THUMBNAILER_VERSION_MICRO@
+#define THUMBNAILER_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define THUMBNAILER_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define THUMBNAILER_VERSION_MICRO @PROJECT_VERSION_PATCH@
 #define THUMBNAILER_VERSION_FILENAME "thumbnailer-version"
 
 // Encoding version of caches.

=== modified file 'include/unity/thumbnailer/qt/CMakeLists.txt'
--- include/unity/thumbnailer/qt/CMakeLists.txt	2015-08-11 09:39:00 +0000
+++ include/unity/thumbnailer/qt/CMakeLists.txt	2016-07-19 01:10:03 +0000
@@ -1,1 +1,2 @@
-install(FILES thumbnailer-qt.h DESTINATION ${LIBTHUMBNAILER_QT_HDR_INSTALL_DIR})
+set(prefix "unity/thumbnailer/qt")
+install(FILES thumbnailer-qt.h DESTINATION "${LIBTHUMBNAILER_QT_HDR_INSTALL_DIR}/${prefix}")

=== modified file 'src/libthumbnailer-qt/libthumbnailer-qt.pc.in'
--- src/libthumbnailer-qt/libthumbnailer-qt.pc.in	2015-08-04 14:13:14 +0000
+++ src/libthumbnailer-qt/libthumbnailer-qt.pc.in	2016-07-19 01:10:03 +0000
@@ -16,13 +16,9 @@
 # Authored by: Xavi Garcia Mena <[e-mail]>
 #
 
-prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/@LIBTHUMBNAILER_QT_HDR_INSTALL_DIR@
-libdir=${prefix}/@LIBDIR@
-
 Name: libthumbnailer-qt
 Description: Thumbnailer Qt library
-Requires: thumbnailer-service
-Version: @LIBTHUMBNAILER_QT_SO_VERSION_MAJOR@.@LIBTHUMBNAILER_QT_SO_VERSION_MINOR@.@LIBTHUMBNAILER_QT_SO_VERSION_MICRO@
-Libs: -L${libdir} -l@LIBTHUMBNAILER_QT@
-Cflags: -I${includedir}
+Requires: Qt5Gui
+Version: @PROJECT_VERSION@
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -l@LIBTHUMBNAILER_QT@
+Cflags: -I@LIBTHUMBNAILER_QT_HDR_INSTALL_DIR@

=== modified file 'src/service/credentialscache.cpp'
--- src/service/credentialscache.cpp	2015-09-29 14:05:53 +0000
+++ src/service/credentialscache.cpp	2016-07-19 01:10:03 +0000
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of version 3 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authors:
- *    James Henstridge <[e-mail]>
+ * Authors: James Henstridge <[e-mail]>
  */
 
 #include "credentialscache.h"

=== modified file 'src/service/credentialscache.h'
--- src/service/credentialscache.h	2015-09-29 14:05:53 +0000
+++ src/service/credentialscache.h	2016-07-19 01:10:03 +0000
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of version 3 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authors:
- *    James Henstridge <[e-mail]>
+ * Authors: James Henstridge <[e-mail]>
  */
 
 #pragma once