Merge lp:~laney/gsettings-qt/add-symbols-file into lp:gsettings-qt

[Iain Lane]

Add a symbols file so that the qtdeclarative module (and other rdeps) get correctly versioned dependencies

https://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4101/console

/var/local/autopilot/autopilot.log: /usr/bin/system-settings: symbol lookup error: /usr/lib/x86_64-linux-gnu/qt5/qml/GSettings.1.0/libGSettingsQmlPlugin.so: undefined symbol: _ZN10QGSettings17isSchemaInstalledERK10QByteArray

Something bad might have gone on here, but the deps shouldn't have been satisfiable. They were though, because qtdeclarative5-gsettings1.0 has only got an unversioned dependency on libgsettings-qt1 even though it uses symbols only present in a newer version.

Add a symbols file to ensure these get created properly.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/gsettings-qt-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-qt-ci/20/rebuild

review: Approve (continuous-integration)

[lp:~laney/gsettings-qt/add-symbols-file]

50. By Iain Lane on 2014-05-02

Merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/gsettings-qt-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-qt-ci/23/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== added file 'debian/libgsettings-qt1.symbols'
--- debian/libgsettings-qt1.symbols	1970-01-01 00:00:00 +0000
+++ debian/libgsettings-qt1.symbols	2014-05-02 08:20:44 +0000
@@ -0,0 +1,45 @@
+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_unpack(_GVariant*, void*)@Base" 0.1+14.04.20140408
+ (c++)"qconf_types_collect(_GVariantType const*, void 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++)"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::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<QString>::detach_helper_grow(int, int)@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QString>::append(QString const&)@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QString>::QList(QList<QString> const&)@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QString>::QList(QList<QString> const&)@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QString>::~QList()@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QString>::~QList()@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QVariant>::detach_helper_grow(int, int)@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QVariant>::append(QVariant const&)@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QVariant>::QList(QList<QVariant> const&)@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QVariant>::QList(QList<QVariant> const&)@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QVariant>::~QList()@Base" 0.1+14.04.20140408
+ (c++|optional=templinst)"QList<QVariant>::~QList()@Base" 0.1+14.04.20140408
+ (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++)"typeinfo for QGSettings@Base" 0.1+14.04.20140408
+ (c++)"typeinfo name for QGSettings@Base" 0.1+14.04.20140408
+ (c++)"vtable for QGSettings@Base" 0.1+14.04.20140408

=== modified file 'debian/rules'
--- debian/rules	2013-06-25 16:54:35 +0000
+++ debian/rules	2014-05-02 08:20:44 +0000
@@ -12,5 +12,8 @@
 override_dh_auto_test:
 	xvfb-run -a dh_auto_test
 
+override_dh_makeshlibs:
+	dh_makeshlibs -- -c4
+
 %:
 	dh $@