Merge lp:~michihenning/thumbnailer/merge-crossbuild into lp:thumbnailer

Proposed by Michi Henning on 2016-07-21
Status: Merged
Approved by: James Henstridge on 2016-09-23
Approved revision: 153
Merged at revision: 149
Proposed branch: lp:~michihenning/thumbnailer/merge-crossbuild
Merge into: lp:thumbnailer
Diff against target: 105 lines (+26/-11)
5 files modified
debian/changelog (+13/-0)
debian/control (+1/-1)
debian/copyright (+2/-0)
include/internal/trace.h (+5/-5)
src/trace.cpp (+5/-5)
To merge this branch: bzr merge lp:~michihenning/thumbnailer/merge-crossbuild
Reviewer Review Type Date Requested Status
James Henstridge 2016-07-21 Approve on 2016-07-25
Review via email: mp+300691@code.launchpad.net

Commit message

Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.

Description of the change

Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.

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

I'm not convinced this is correct: while it might get rid of the dependency mess when running under crossbuild, it isn't clear that it is the right option if we were actually to attempt to run the tests.

Better would be to use build profiles to remove the dependency entirely in this configuration:

https://wiki.debian.org/BuildProfileSpec

Ideally we could change it to something like:

    python3-tornado <!nocheck>

But currently crossbuilder isn't setting that profile. It is setting the "cross" profile though, but we really want this tied to whether tests are being run rather than whether it is being cross compiled.

James Henstridge (jamesh) wrote :

And after discussing with Florian, crossbuilder now also sets the nocheck build profile, so <!nocheck> should work.

review: Needs Fixing
James Henstridge (jamesh) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-07-19 01:11:39 +0000
3+++ debian/changelog 2016-09-23 04:09:54 +0000
4@@ -1,3 +1,16 @@
5+thumbnailer (2.4+16.10.20160825-0ubuntu1) yakkety; urgency=medium
6+
7+ * Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.
8+ * Relaxed copyright for trace.cpp and trace.h to LGPL.
9+
10+ -- Michi Henning <michi@triodia.com> Thu, 25 Aug 2016 06:59:02 +0000
11+
12+thumbnailer (2.4+16.10.20160719-0ubuntu2) yakkety; urgency=medium
13+
14+ * No-change rebuild for boost soname change.
15+
16+ -- Matthias Klose <doko@ubuntu.com> Thu, 04 Aug 2016 08:32:55 +0000
17+
18 thumbnailer (2.4+16.10.20160719-0ubuntu1) yakkety; urgency=medium
19
20 [ Michi Henning ]
21
22=== modified file 'debian/control'
23--- debian/control 2016-02-25 09:07:21 +0000
24+++ debian/control 2016-09-23 04:09:54 +0000
25@@ -28,7 +28,7 @@
26 libunity-api-dev,
27 lsb-release,
28 persistent-cache-cpp-dev (>= 1.0.4),
29- python3-tornado,
30+ python3-tornado <!nocheck>,
31 qml-module-qtquick2,
32 qml-module-qttest,
33 qtbase5-dev,
34
35=== modified file 'debian/copyright'
36--- debian/copyright 2015-11-13 04:36:08 +0000
37+++ debian/copyright 2016-09-23 04:09:54 +0000
38@@ -20,7 +20,9 @@
39 Files: plugins/*
40 include/internal/gobj_memory.h
41 include/internal/safe_strerror.h
42+ include/internal/trace.h
43 src/safe_strerror.cpp
44+ src/trace.cpp
45 tests/copyright/*
46 tests/gobj_ptr/*
47 tests/headers/*
48
49=== modified file 'include/internal/trace.h'
50--- include/internal/trace.h 2015-07-03 00:52:37 +0000
51+++ include/internal/trace.h 2016-09-23 04:09:54 +0000
52@@ -1,19 +1,19 @@
53 /*
54- * Copyright (C) 2015 Canonical Ltd.
55+ * Copyright (C) 2015 Canonical Ltd
56 *
57 * This program is free software: you can redistribute it and/or modify
58- * it under the terms of the GNU General Public License version 3 as
59+ * it under the terms of the GNU Lesser General Public License version 3 as
60 * published by the Free Software Foundation.
61 *
62 * This program is distributed in the hope that it will be useful,
63 * but WITHOUT ANY WARRANTY; without even the implied warranty of
64 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
65- * GNU General Public License for more details.
66+ * GNU Lesser General Public License for more details.
67 *
68- * You should have received a copy of the GNU General Public License
69+ * You should have received a copy of the GNU Lesser General Public License
70 * along with this program. If not, see <http://www.gnu.org/licenses/>.
71 *
72- * Authored by: Michi Henning <michi@canonical.com>
73+ * Authors: Michi Henning <michi.henning@canonical.com>
74 */
75
76 #pragma once
77
78=== modified file 'src/trace.cpp'
79--- src/trace.cpp 2015-10-12 03:43:04 +0000
80+++ src/trace.cpp 2016-09-23 04:09:54 +0000
81@@ -1,19 +1,19 @@
82 /*
83- * Copyright (C) 2015 Canonical Ltd.
84+ * Copyright (C) 2015 Canonical Ltd
85 *
86 * This program is free software: you can redistribute it and/or modify
87- * it under the terms of the GNU General Public License version 3 as
88+ * it under the terms of the GNU Lesser General Public License version 3 as
89 * published by the Free Software Foundation.
90 *
91 * This program is distributed in the hope that it will be useful,
92 * but WITHOUT ANY WARRANTY; without even the implied warranty of
93 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
94- * GNU General Public License for more details.
95+ * GNU Lesser General Public License for more details.
96 *
97- * You should have received a copy of the GNU General Public License
98+ * You should have received a copy of the GNU Lesser General Public License
99 * along with this program. If not, see <http://www.gnu.org/licenses/>.
100 *
101- * Authored by: Michi Henning <michi.henning@canonical.com>
102+ * Authors: Michi Henning <michi.henning@canonical.com>
103 */
104
105 #include <internal/trace.h>

Subscribers

People subscribed via source and target branches

to all changes: