-
Committer:
Michi Henning
-
Date:
2016-09-27 22:16:13 UTC
-
mfrom:
(121.22.6 thumbnailer)
-
Revision ID:
michi.henning@canonical.com-20160927221613-pwvuc22wtmuvk3i9
Back-merge from trunk:
* Disabled QDBus-related tests on xenial and yakkety for the time being due
to problems with Qt 5.6. See
https://bugs.launchpad.net/ubuntu/+source/thumbnailer/+bug/1613561
https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1625930
* Changed python-tornado dependency to python-tornado <!nocheck> for
cross-builds.
* Changed python-tornado dependency to python-tornado <!nocheck> for cross-builds.
* Relaxed copyright for trace.cpp and trace.h to LGPL.
* No-change rebuild for boost soname change.
[ Michi Henning ]
* Changed copyright from GPL to LGPL for two files used in storage framework.
[ James Henstridge ]
* Fixed pkgconfig file for qt library.