Thumbnailer

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

  1. merge-crossbuild
  2. Merge into trunk
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
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 Approve
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.
Revision history for this message
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.

Revision history for this message
James Henstridge (jamesh) wrote :

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

review: Needs Fixing
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2016-07-19 01:11:39 +0000
+++ debian/changelog 2016-09-23 04:09:54 +0000
@@ -1,3 +1,16 @@
1thumbnailer (2.4+16.10.20160825-0ubuntu1) yakkety; urgency=medium
2
3 * Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.
4 * Relaxed copyright for trace.cpp and trace.h to LGPL.
5
6 -- Michi Henning <michi@triodia.com> Thu, 25 Aug 2016 06:59:02 +0000
7
8thumbnailer (2.4+16.10.20160719-0ubuntu2) yakkety; urgency=medium
9
10 * No-change rebuild for boost soname change.
11
12 -- Matthias Klose <doko@ubuntu.com> Thu, 04 Aug 2016 08:32:55 +0000
13
1thumbnailer (2.4+16.10.20160719-0ubuntu1) yakkety; urgency=medium14thumbnailer (2.4+16.10.20160719-0ubuntu1) yakkety; urgency=medium
215
3 [ Michi Henning ]16 [ Michi Henning ]
417
=== modified file 'debian/control'
--- debian/control 2016-02-25 09:07:21 +0000
+++ debian/control 2016-09-23 04:09:54 +0000
@@ -28,7 +28,7 @@
28 libunity-api-dev,28 libunity-api-dev,
29 lsb-release,29 lsb-release,
30 persistent-cache-cpp-dev (>= 1.0.4),30 persistent-cache-cpp-dev (>= 1.0.4),
31 python3-tornado,31 python3-tornado <!nocheck>,
32 qml-module-qtquick2,32 qml-module-qtquick2,
33 qml-module-qttest,33 qml-module-qttest,
34 qtbase5-dev,34 qtbase5-dev,
3535
=== modified file 'debian/copyright'
--- debian/copyright 2015-11-13 04:36:08 +0000
+++ debian/copyright 2016-09-23 04:09:54 +0000
@@ -20,7 +20,9 @@
20Files: plugins/*20Files: plugins/*
21 include/internal/gobj_memory.h21 include/internal/gobj_memory.h
22 include/internal/safe_strerror.h22 include/internal/safe_strerror.h
23 include/internal/trace.h
23 src/safe_strerror.cpp24 src/safe_strerror.cpp
25 src/trace.cpp
24 tests/copyright/*26 tests/copyright/*
25 tests/gobj_ptr/*27 tests/gobj_ptr/*
26 tests/headers/*28 tests/headers/*
2729
=== modified file 'include/internal/trace.h'
--- include/internal/trace.h 2015-07-03 00:52:37 +0000
+++ include/internal/trace.h 2016-09-23 04:09:54 +0000
@@ -1,19 +1,19 @@
1/*1/*
2 * Copyright (C) 2015 Canonical Ltd.2 * Copyright (C) 2015 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU Lesser General Public License version 3 as
6 * published by the Free Software Foundation.6 * published by the Free Software Foundation.
7 *7 *
8 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.11 * GNU Lesser General Public License for more details.
12 *12 *
13 * You should have received a copy of the GNU General Public License13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *15 *
16 * Authored by: Michi Henning <michi@canonical.com>16 * Authors: Michi Henning <michi.henning@canonical.com>
17 */17 */
1818
19#pragma once19#pragma once
2020
=== modified file 'src/trace.cpp'
--- src/trace.cpp 2015-10-12 03:43:04 +0000
+++ src/trace.cpp 2016-09-23 04:09:54 +0000
@@ -1,19 +1,19 @@
1/*1/*
2 * Copyright (C) 2015 Canonical Ltd.2 * Copyright (C) 2015 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU Lesser General Public License version 3 as
6 * published by the Free Software Foundation.6 * published by the Free Software Foundation.
7 *7 *
8 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.11 * GNU Lesser General Public License for more details.
12 *12 *
13 * You should have received a copy of the GNU General Public License13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *15 *
16 * Authored by: Michi Henning <michi.henning@canonical.com>16 * Authors: Michi Henning <michi.henning@canonical.com>
17 */17 */
1818
19#include <internal/trace.h>19#include <internal/trace.h>

Subscribers

People subscribed via source and target branches

to all changes: