=== modified file 'debian/changelog' --- debian/changelog 2016-03-29 12:56:42 +0000 +++ debian/changelog 2016-04-18 11:59:59 +0000 @@ -1,3 +1,12 @@ +gsettings-qt (0.1+16.04.20160329-0ubuntu2) UNRELEASED; urgency=medium + + * Build against Qt 5.6. + * Adjust test running to changes in Qt 5.6. + * debian/control: don't use transitional package names + * Update symbols. + + -- Timo Jyrinki Fri, 01 Apr 2016 10:12:26 +0000 + gsettings-qt (0.1+16.04.20160329-0ubuntu1) xenial; urgency=medium [ Albert Astals Cid ] === modified file 'debian/control' --- debian/control 2014-08-07 15:06:33 +0000 +++ debian/control 2016-04-01 10:13:23 +0000 @@ -9,8 +9,8 @@ qtbase5-dev, qtdeclarative5-dev, qtdeclarative5-dev-tools, - qtdeclarative5-test-plugin, - qtdeclarative5-qtquick2-plugin, + qml-module-qttest, + qml-module-qtquick2, xvfb, Standards-Version: 3.9.4 Section: libs === modified file 'debian/libgsettings-qt1.symbols' --- debian/libgsettings-qt1.symbols 2014-08-01 17:06:54 +0000 +++ debian/libgsettings-qt1.symbols 2016-04-01 10:43:28 +0000 @@ -1,48 +1,37 @@ +# SymbolsHelper-Confirmed: 0.1+16.04.20160329-0ubuntu2 amd64 arm64 armhf i386 ppc64el libgsettings-qt.so.1 libgsettings-qt1 #MINVER# - (c++)"qtify_name(char const*)@Base" 0.1+14.04.20140408 - (c++)"unqtify_name(QString const&)@Base" 0.1+14.04.20140408 - (c++)"qconf_types_convert(_GVariantType const*)@Base" 0.1+14.04.20140408 - (c++)"qconf_types_to_qvariant(_GVariant*)@Base" 0.1+14.04.20140408 - (c++)"qconf_types_collect_from_variant(_GVariantType const*, QVariant const&)@Base" 0.1+14.04.20140408 - (c++)"QByteArray::~QByteArray()@Base" 0.1+14.04.20140408 - (c++)"QByteArray::~QByteArray()@Base" 0.1+14.04.20140408 + (c++)"QByteArray::~QByteArray()@Base" 0.1+14.04.20140408 + (c++)"QGSettings::QGSettings(QByteArray const&, QByteArray const&, QObject*)@Base" 0.1+14.04.20140408 + (c++)"QGSettings::changed(QString const&)@Base" 0.1+14.04.20140408 + (c++)"QGSettings::choices(QString const&) const@Base" 0.1+14.04.20140408 + (c++)"QGSettings::get(QString const&) const@Base" 0.1+14.04.20140408 + (c++)"QGSettings::isSchemaInstalled(QByteArray const&)@Base" 0.1+14.04.20140408 + (c++)"QGSettings::keys() const@Base" 0.1+14.04.20140408 + (c++)"QGSettings::metaObject() const@Base" 0.1+14.04.20140408 (c++)"QGSettings::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.1+14.04.20140408 (c++)"QGSettings::qt_metacast(char const*)@Base" 0.1+14.04.20140408 + (c++)"QGSettings::reset(QString const&)@Base" 0.1+14.04.20140408 + (c++)"QGSettings::set(QString const&, QVariant const&)@Base" 0.1+14.04.20140408 (c++)"QGSettings::staticMetaObject@Base" 0.1+14.04.20140408 - (c++)"QGSettings::isSchemaInstalled(QByteArray const&)@Base" 0.1+14.04.20140408 - (c++)"QGSettings::set(QString const&, QVariant const&)@Base" 0.1+14.04.20140408 - (c++)"QGSettings::reset(QString const&)@Base" 0.1+14.04.20140408 (c++)"QGSettings::trySet(QString const&, QVariant const&)@Base" 0.1+14.04.20140408 - (c++)"QGSettings::changed(QString const&)@Base" 0.1+14.04.20140408 - (c++)"QGSettings::QGSettings(QByteArray const&, QByteArray const&, QObject*)@Base" 0.1+14.04.20140408 - (c++)"QGSettings::QGSettings(QByteArray const&, QByteArray const&, QObject*)@Base" 0.1+14.04.20140408 - (c++)"QGSettings::~QGSettings()@Base" 0.1+14.04.20140408 - (c++)"QGSettings::~QGSettings()@Base" 0.1+14.04.20140408 (c++)"QGSettings::~QGSettings()@Base" 0.1+14.04.20140408 (c++)"QGSettingsPrivate::settingChanged(_GSettings*, char const*, void*)@Base" 0.1+14.04.20140408 (c++|optional=templinst)"QList::append(QString const&)@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::QList(QList const&)@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::QList(QList const&)@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::~QList()@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::~QList()@Base" 0.1+14.04.20140408 + (c++|optional=templinst)"QList::detach_helper_grow(int, int)@Base" 0.1+14.10.20140801.1 + (c++|optional=templinst)"QList::~QList()@Base" 0.1+14.04.20140408 + (c++|optional=templinst|arch=!ppc64el)"QList::append(QVariant const&)@Base" 0.1+14.04.20140408 (c++|optional=templinst)"QList::detach_helper_grow(int, int)@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::append(QVariant const&)@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::QList(QList const&)@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::QList(QList const&)@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::~QList()@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::~QList()@Base" 0.1+14.04.20140408 - (c++|optional=templinst)"QList::detach_helper_grow(int, int)@Base" 0.1+14.10.20140801.1 - (c++|optional=templinst)"QMap::detach_helper()@Base" 0.1+14.10.20140801.1 - (c++)"QMap::~QMap()@Base" 0.1+14.10.20140801.1 - (c++)"QMap::~QMap()@Base" 0.1+14.10.20140801.1 + (c++|optional=templinst)"QList::~QList()@Base" 0.1+14.04.20140408 + (c++)"QMap::~QMap()@Base" 0.1+14.10.20140801.1 + (c++)"QMapNode::copy(QMapData*) const@Base" 0.1+14.10.20140801.1 (c++)"QMapNode::destroySubTree()@Base" 0.1+14.10.20140801.1 - (c++)"QMapNode::copy(QMapData*) const@Base" 0.1+14.10.20140801.1 - (c++)"QString::~QString()@Base" 0.1+14.04.20140408 - (c++)"QString::~QString()@Base" 0.1+14.04.20140408 - (c++)"QGSettings::metaObject() const@Base" 0.1+14.04.20140408 - (c++)"QGSettings::get(QString const&) const@Base" 0.1+14.04.20140408 - (c++)"QGSettings::keys() const@Base" 0.1+14.04.20140408 - (c++)"QGSettings::choices(QString const&) const@Base" 0.1+14.04.20140408 + (c++)"QString::~QString()@Base" 0.1+14.04.20140408 + (optional=templinst)_ZN8QMapDataI7QString8QVariantE7destroyEv@Base 0.1+16.04.20160329-0ubuntu2 + (c++)"qconf_types_collect_from_variant(_GVariantType const*, QVariant const&)@Base" 0.1+14.04.20140408 + (c++)"qconf_types_convert(_GVariantType const*)@Base" 0.1+14.04.20140408 + (c++)"qconf_types_to_qvariant(_GVariant*)@Base" 0.1+14.04.20140408 + (c++)"qtify_name(char const*)@Base" 0.1+14.04.20140408 (c++)"typeinfo for QGSettings@Base" 0.1+14.04.20140408 (c++)"typeinfo name for QGSettings@Base" 0.1+14.04.20140408 + (c++)"unqtify_name(QString const&)@Base" 0.1+14.04.20140408 (c++)"vtable for QGSettings@Base" 0.1+14.04.20140408 === modified file 'debian/rules' --- debian/rules 2014-04-10 17:27:58 +0000 +++ debian/rules 2016-04-01 10:14:27 +0000 @@ -10,7 +10,7 @@ dh_install --fail-missing override_dh_auto_test: - xvfb-run -a dh_auto_test + QT_QPA_PLATFORM=minimal LD_LIBRARY_PATH=../src GSETTINGS_BACKEND=memory GSETTINGS_SCHEMA_DIR=. xvfb-run -a dh_auto_test override_dh_makeshlibs: dh_makeshlibs -- -c4 === modified file 'tests/cpptest.pro' --- tests/cpptest.pro 2015-07-28 14:55:40 +0000 +++ tests/cpptest.pro 2016-04-01 10:12:20 +0000 @@ -14,5 +14,3 @@ QMAKE_EXTRA_TARGETS += schema PRE_TARGETDEPS = gschemas.compiled -# qmake prepends this to the command line executed by `make check` -check.commands = QT_QPA_PLATFORM=minimal LD_LIBRARY_PATH=$$PWD/../src GSETTINGS_BACKEND=memory GSETTINGS_SCHEMA_DIR=$$PWD === modified file 'tests/tests.pro' --- tests/tests.pro 2014-01-09 09:13:29 +0000 +++ tests/tests.pro 2016-04-01 10:12:24 +0000 @@ -12,7 +12,4 @@ QMAKE_EXTRA_TARGETS += schema PRE_TARGETDEPS = gschemas.compiled -# qmake prepends this to the command line executed by `make check` -check.commands = QT_QPA_PLATFORM=minimal LD_LIBRARY_PATH=$$PWD/../src GSETTINGS_BACKEND=memory GSETTINGS_SCHEMA_DIR=$$PWD - OTHER_FILES += tst_GSettings.qml