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

[Michi Henning]

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

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

[James Henstridge (jamesh)]

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)]

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

review: Needs Fixing

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== 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 @@
+thumbnailer (2.4+16.10.20160825-0ubuntu1) yakkety; urgency=medium
+
+  * Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.
+  * Relaxed copyright for trace.cpp and trace.h to LGPL.
+
+ -- Michi Henning <[e-mail]>  Thu, 25 Aug 2016 06:59:02 +0000
+
+thumbnailer (2.4+16.10.20160719-0ubuntu2) yakkety; urgency=medium
+
+  * No-change rebuild for boost soname change.
+
+ -- Matthias Klose <[e-mail]>  Thu, 04 Aug 2016 08:32:55 +0000
+
 thumbnailer (2.4+16.10.20160719-0ubuntu1) yakkety; urgency=medium
 
   [ Michi Henning ]

=== 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 @@
                libunity-api-dev,
                lsb-release,
                persistent-cache-cpp-dev (>= 1.0.4),
-               python3-tornado,
+               python3-tornado <!nocheck>,
                qml-module-qtquick2,
                qml-module-qttest,
                qtbase5-dev,

=== 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 @@
 Files: plugins/*
        include/internal/gobj_memory.h
        include/internal/safe_strerror.h
+       include/internal/trace.h
        src/safe_strerror.cpp
+       src/trace.cpp
        tests/copyright/*
        tests/gobj_ptr/*
        tests/headers/*

=== 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 @@
 /*
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2015 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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/>.
  *
- * Authored by: Michi Henning <[e-mail]>
+ * Authors: Michi Henning <[e-mail]>
  */
 
 #pragma once

=== 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 @@
 /*
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2015 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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/>.
  *
- * Authored by: Michi Henning <[e-mail]>
+ * Authors: Michi Henning <[e-mail]>
  */
 
 #include <internal/trace.h>