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

Proposed by Michi Henning on 2016-07-13
Status: Merged
Approved by: James Henstridge on 2016-07-13
Approved revision: 146
Merged at revision: 146
Proposed branch: lp:~michihenning/thumbnailer/fix-qt-pkg-config
Merge into: lp:thumbnailer
Diff against target: 200 lines (+53/-51)
7 files modified
CMakeLists.txt (+8/-11)
debian/changelog (+10/-0)
include/internal/version.h.in (+3/-3)
include/unity/thumbnailer/qt/CMakeLists.txt (+2/-1)
src/libthumbnailer-qt/libthumbnailer-qt.pc.in (+4/-8)
src/service/credentialscache.cpp (+13/-14)
src/service/credentialscache.h (+13/-14)
To merge this branch: bzr merge lp:~michihenning/thumbnailer/fix-qt-pkg-config
Reviewer Review Type Date Requested Status
James Henstridge 2016-07-13 Approve on 2016-07-13
Review via email: mp+299913@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
James Henstridge (jamesh) wrote :

Looks good.

review: Approve
147. By Michi Henning on 2016-07-19

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-03-17 01:46:29 +0000
3+++ CMakeLists.txt 2016-07-19 01:10:03 +0000
4@@ -4,11 +4,11 @@
5 set(LOCAL_INSTALL "ON")
6 endif()
7
8-project(thumbnailer C CXX)
9+cmake_minimum_required(VERSION 3.0.2)
10+project(thumbnailer VERSION "2.4.0" LANGUAGES C CXX)
11
12 set(CMAKE_INCLUDE_CURRENT_DIR ON)
13
14-cmake_minimum_required(VERSION 2.8.11)
15
16 # Suppress complaints by cmake about COMPILE_DEFINITIONS_<Config> caused by qt5 cmake macros.
17 cmake_policy(SET CMP0043 OLD)
18@@ -47,18 +47,15 @@
19
20 add_definitions(-DQT_NO_KEYWORDS)
21
22+include(GNUInstallDirs)
23+
24 # libthumbnailer-qt version
25 set(LIBTHUMBNAILER_QT thumbnailer-qt)
26 set(LIBTHUMBNAILER_QT_SO_VERSION_MAJOR "1")
27 set(LIBTHUMBNAILER_QT_SO_VERSION_MINOR "0")
28 set(LIBTHUMBNAILER_QT_SO_VERSION_MICRO "0")
29 set(LIBTHUMBNAILER_QT_SO_VERSION ${LIBTHUMBNAILER_QT_SO_VERSION_MAJOR}.${LIBTHUMBNAILER_QT_SO_VERSION_MINOR})
30-set(LIBTHUMBNAILER_QT_HDR_INSTALL_DIR include/${LIBTHUMBNAILER_QT}-${LIBTHUMBNAILER_QT_SO_VERSION}/unity/thumbnailer/qt)
31-
32-# thumbnailer-service version
33-set(THUMBNAILER_VERSION_MAJOR "2")
34-set(THUMBNAILER_VERSION_MINOR "4")
35-set(THUMBNAILER_VERSION_MICRO "0")
36+set(LIBTHUMBNAILER_QT_HDR_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${LIBTHUMBNAILER_QT}-${LIBTHUMBNAILER_QT_SO_VERSION})
37
38 # Encoding version of cache files
39 set(THUMBNAILER_CACHE_VERSION "2")
40@@ -106,16 +103,16 @@
41
42 include(cmake/UseGSettings.cmake)
43
44-include(GNUInstallDirs)
45-set(LIBDIR ${CMAKE_INSTALL_LIBDIR})
46 set(SHARE_PRIV_DIR ${CMAKE_INSTALL_LIBDIR}/thumbnailer)
47-set(SHARE_PRIV_ABS ${CMAKE_INSTALL_PREFIX}/${SHARE_PRIV_DIR})
48+set(SHARE_PRIV_ABS ${CMAKE_INSTALL_FULL_LIBDIR}/thumbnailer)
49
50 find_package(Boost COMPONENTS filesystem iostreams regex system REQUIRED)
51 find_package(Threads REQUIRED)
52 find_package(Qt5Core REQUIRED)
53 find_package(Qt5DBus REQUIRED)
54 find_package(Qt5Gui REQUIRED)
55+find_package(Qt5Qml REQUIRED)
56+find_package(Qt5Quick REQUIRED)
57
58 include(FindPkgConfig)
59 pkg_check_modules(GST_DEPS REQUIRED gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-tag-1.0)
60
61=== modified file 'debian/changelog'
62--- debian/changelog 2016-05-30 11:07:33 +0000
63+++ debian/changelog 2016-07-19 01:10:03 +0000
64@@ -1,3 +1,13 @@
65+thumbnailer (2.4+16.10.20160530.3-0ubuntu3) UNRELEASED; urgency=medium
66+
67+ [ Michi Henning ]
68+ * Changed copyright from GPL to LGPL for two files used in storage framework.
69+
70+ [ James Henstridge ]
71+ * Fixed pkgconfig file for qt library.
72+
73+ -- Michi Henning <michi.henning@canonical.com> Wed, 13 Jul 2016 16:40:46 +1000
74+
75 thumbnailer (2.4+16.10.20160530.3-0ubuntu1) yakkety; urgency=medium
76
77 [ Michi Henning ]
78
79=== modified file 'include/internal/version.h.in'
80--- include/internal/version.h.in 2016-02-15 06:51:18 +0000
81+++ include/internal/version.h.in 2016-07-19 01:10:03 +0000
82@@ -30,9 +30,9 @@
83 {
84
85 // Software release version.
86-#define THUMBNAILER_VERSION_MAJOR @THUMBNAILER_VERSION_MAJOR@
87-#define THUMBNAILER_VERSION_MINOR @THUMBNAILER_VERSION_MINOR@
88-#define THUMBNAILER_VERSION_MICRO @THUMBNAILER_VERSION_MICRO@
89+#define THUMBNAILER_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
90+#define THUMBNAILER_VERSION_MINOR @PROJECT_VERSION_MINOR@
91+#define THUMBNAILER_VERSION_MICRO @PROJECT_VERSION_PATCH@
92 #define THUMBNAILER_VERSION_FILENAME "thumbnailer-version"
93
94 // Encoding version of caches.
95
96=== modified file 'include/unity/thumbnailer/qt/CMakeLists.txt'
97--- include/unity/thumbnailer/qt/CMakeLists.txt 2015-08-11 09:39:00 +0000
98+++ include/unity/thumbnailer/qt/CMakeLists.txt 2016-07-19 01:10:03 +0000
99@@ -1,1 +1,2 @@
100-install(FILES thumbnailer-qt.h DESTINATION ${LIBTHUMBNAILER_QT_HDR_INSTALL_DIR})
101+set(prefix "unity/thumbnailer/qt")
102+install(FILES thumbnailer-qt.h DESTINATION "${LIBTHUMBNAILER_QT_HDR_INSTALL_DIR}/${prefix}")
103
104=== modified file 'src/libthumbnailer-qt/libthumbnailer-qt.pc.in'
105--- src/libthumbnailer-qt/libthumbnailer-qt.pc.in 2015-08-04 14:13:14 +0000
106+++ src/libthumbnailer-qt/libthumbnailer-qt.pc.in 2016-07-19 01:10:03 +0000
107@@ -16,13 +16,9 @@
108 # Authored by: Xavi Garcia Mena <xavi.garcia.mena@canonical.com>
109 #
110
111-prefix=@CMAKE_INSTALL_PREFIX@
112-includedir=${prefix}/@LIBTHUMBNAILER_QT_HDR_INSTALL_DIR@
113-libdir=${prefix}/@LIBDIR@
114-
115 Name: libthumbnailer-qt
116 Description: Thumbnailer Qt library
117-Requires: thumbnailer-service
118-Version: @LIBTHUMBNAILER_QT_SO_VERSION_MAJOR@.@LIBTHUMBNAILER_QT_SO_VERSION_MINOR@.@LIBTHUMBNAILER_QT_SO_VERSION_MICRO@
119-Libs: -L${libdir} -l@LIBTHUMBNAILER_QT@
120-Cflags: -I${includedir}
121+Requires: Qt5Gui
122+Version: @PROJECT_VERSION@
123+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -l@LIBTHUMBNAILER_QT@
124+Cflags: -I@LIBTHUMBNAILER_QT_HDR_INSTALL_DIR@
125
126=== modified file 'src/service/credentialscache.cpp'
127--- src/service/credentialscache.cpp 2015-09-29 14:05:53 +0000
128+++ src/service/credentialscache.cpp 2016-07-19 01:10:03 +0000
129@@ -1,20 +1,19 @@
130 /*
131- * Copyright (C) 2015 Canonical, Ltd.
132- *
133- * This library is free software; you can redistribute it and/or modify it under
134- * the terms of version 3 of the GNU General Public License as published
135- * by the Free Software Foundation.
136- *
137- * This library is distributed in the hope that it will be useful, but WITHOUT
138- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
139- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
140- * details.
141- *
142- * You should have received a copy of the GNU General Public License
143+ * Copyright (C) 2015 Canonical Ltd
144+ *
145+ * This program is free software: you can redistribute it and/or modify
146+ * it under the terms of the GNU Lesser General Public License version 3 as
147+ * published by the Free Software Foundation.
148+ *
149+ * This program is distributed in the hope that it will be useful,
150+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
151+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
152+ * GNU Lesser General Public License for more details.
153+ *
154+ * You should have received a copy of the GNU Lesser General Public License
155 * along with this program. If not, see <http://www.gnu.org/licenses/>.
156 *
157- * Authors:
158- * James Henstridge <james.henstridge@canonical.com>
159+ * Authors: James Henstridge <james.henstridge@canonical.com>
160 */
161
162 #include "credentialscache.h"
163
164=== modified file 'src/service/credentialscache.h'
165--- src/service/credentialscache.h 2015-09-29 14:05:53 +0000
166+++ src/service/credentialscache.h 2016-07-19 01:10:03 +0000
167@@ -1,20 +1,19 @@
168 /*
169- * Copyright (C) 2015 Canonical, Ltd.
170- *
171- * This library is free software; you can redistribute it and/or modify it under
172- * the terms of version 3 of the GNU General Public License as published
173- * by the Free Software Foundation.
174- *
175- * This library is distributed in the hope that it will be useful, but WITHOUT
176- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
177- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
178- * details.
179- *
180- * You should have received a copy of the GNU General Public License
181+ * Copyright (C) 2015 Canonical Ltd
182+ *
183+ * This program is free software: you can redistribute it and/or modify
184+ * it under the terms of the GNU Lesser General Public License version 3 as
185+ * published by the Free Software Foundation.
186+ *
187+ * This program is distributed in the hope that it will be useful,
188+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
189+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
190+ * GNU Lesser General Public License for more details.
191+ *
192+ * You should have received a copy of the GNU Lesser General Public License
193 * along with this program. If not, see <http://www.gnu.org/licenses/>.
194 *
195- * Authors:
196- * James Henstridge <james.henstridge@canonical.com>
197+ * Authors: James Henstridge <james.henstridge@canonical.com>
198 */
199
200 #pragma once

Subscribers

People subscribed via source and target branches

to all changes: