[SCM] qtdeclarative packaging branch, master, updated. debian/5.0.2-4-17-g20d1743
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Wed Jun 19 23:40:29 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=9ec2e0f
The following commit has been merged in the master branch:
commit 9ec2e0fcce9fb6552699a523d8e6ece69b123c08
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Jun 19 12:35:29 2013 -0300
Update symbols files.
---
debian/changelog | 16 ++++++++++++++++
debian/libqt5qml5.symbols | 19 ++++++++++---------
debian/libqt5quickparticles5.symbols | 2 --
3 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 65b9917..55b943d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
qtdeclarative-opensource-src (5.0.2-5) UNRELEASED; urgency=low
+<<<<<<<
[ Lisandro Damián Nicanor Pérez Meyer ]
* Make every package that ships a binary managed by qtchooser depend on it.
* Build the documentation shipped with this submodule as a build-indep task:
@@ -12,6 +13,21 @@ qtdeclarative-opensource-src (5.0.2-5) UNRELEASED; urgency=low
* Depend on libgl1-mesa-dri from the qtquick2 QML plugin
- Not depending may cause crashes due to lack of VBO support
(https://bugs.launchpad.net/bugs/1176199)
+=======
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Make every package that ships a binary managed by qtchooser depend on it.
+ * Build the documentation shipped with this submodule as a build-indep task:
+ - Add the necessary indep build dependencies:
+ * qttools5-dev-tools to use qhelpgenerator.
+ * libqt5sql5-sqlite to generate qch doc.
+ - Build and create a packages for qch and HTML doc formats.
+ * Update symbols files.
+
+ [ Timo Jyrinki ]
+ * Depend on libgl1-mesa-dri from the qtquick2 QML plugin
+ - Not depending may cause crashes due to lack of VBO support
+ (https://bugs.launchpad.net/bugs/1176199)
+>>>>>>>
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 23 May 2013 21:27:24 -0300
diff --git a/debian/libqt5qml5.symbols b/debian/libqt5qml5.symbols
index df8e4c8..b092768 100644
--- a/debian/libqt5qml5.symbols
+++ b/debian/libqt5qml5.symbols
@@ -16,7 +16,8 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
_Z7qmlInfoPK7QObjectRK5QListI9QQmlErrorE at Base 5.0.2
_Z7qmlInfoPK7QObjectRK9QQmlError at Base 5.0.2
_Z9qmlEnginePK7QObject at Base 5.0.2
- (optional=gccinternal|arch=!armhf)_ZN10QByteArray4dataEv at Base 5.0.2
+ (optional=gccinternal|arch=!amd64 !armhf)_ZN10QByteArray4dataEv at Base 5.0.2
+ (arch=amd64)_ZN10QByteArray7reserveEi at Base 5.0.2
_ZN10QQmlBundle11addMetaLinkERK7QStringS2_RK10QByteArray at Base 5.0.2
_ZN10QQmlBundle14isBundleHeaderEPKci at Base 5.0.2
_ZN10QQmlBundle15findInsertPointEjPi at Base 5.0.2
@@ -83,7 +84,7 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
_ZN10QQmlScript7VariantC2EdRK10QStringRef at Base 5.0.2
_ZN10QQmlScript7VariantC2Ev at Base 5.0.2
_ZN10QQmlScript7VariantaSERKS0_ at Base 5.0.2
- (optional=templinst|arch=!amd64)_ZN11QMetaMethod10fromSignalIM13QNetworkReplyFvxxEEES_T_ at Base 5.0.2
+ (optional=templinst|arch=!amd64 !i386)_ZN11QMetaMethod10fromSignalIM13QNetworkReplyFvxxEEES_T_ at Base 5.0.2
(optional=templinst|arch=armhf)_ZN11QMetaMethod10fromSignalIM20QQmlFileNetworkReplyFvxxEEES_T_ at Base 5.0.2
_ZN11QQmlBinding10expressionEPK19QQmlAbstractBinding at Base 5.0.2
_ZN11QQmlBinding10setEnabledEP19QQmlAbstractBindingb6QFlagsIN19QQmlPropertyPrivate9WriteFlagEE at Base 5.0.2
@@ -147,8 +148,8 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
_ZN11QQmlImports10setBaseUrlERK4QUrlRK7QString at Base 5.0.2
_ZN11QQmlImports12locateQmldirEP18QQmlImportDatabaseRK7QStringiiPS2_S5_ at Base 5.0.2
_ZN11QQmlImports13addFileImportEP18QQmlImportDatabaseRK7QStringS4_iibP5QListI9QQmlErrorE at Base 5.0.2
- (optional=gccinternal|arch=!armhf)_ZN11QQmlImports15ScriptReferenceC1ERKS0_ at Base 5.0.2
- (optional=gccinternal|arch=!armhf)_ZN11QQmlImports15ScriptReferenceC2ERKS0_ at Base 5.0.2
+ (optional=gccinternal|arch=!amd64 !armhf)_ZN11QQmlImports15ScriptReferenceC1ERKS0_ at Base 5.0.2
+ (optional=gccinternal|arch=!amd64 !armhf)_ZN11QQmlImports15ScriptReferenceC2ERKS0_ at Base 5.0.2
_ZN11QQmlImports16addLibraryImportEP18QQmlImportDatabaseRK7QStringS4_iiS4_S4_bP5QListI9QQmlErrorE at Base 5.0.2
_ZN11QQmlImports17addImplicitImportEP18QQmlImportDatabaseP5QListI9QQmlErrorE at Base 5.0.2
_ZN11QQmlImports18completeQmldirPathERK7QStringS2_iiNS_13ImportVersionE at Base 5.0.2
@@ -1163,9 +1164,9 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
_ZN7QQmlVME5resetEv at Base 5.0.2
_ZN7QQmlVME7executeEP5QListI9QQmlErrorERKNS_9InterruptE at Base 5.0.2
_ZN7QQmlVME8completeERKNS_9InterruptE at Base 5.0.2
- (optional=gccinternal|arch=!armhf)_ZN7QQmlVMED1Ev at Base 5.0.2
- (optional=gccinternal|arch=!armhf)_ZN7QQmlVMED2Ev at Base 5.0.2
- (optional=gccinternal|arch=!armhf)_ZN7QString5clearEv at Base 5.0.2
+ (optional=gccinternal|arch=!amd64 !armhf)_ZN7QQmlVMED1Ev at Base 5.0.2
+ (optional=gccinternal|arch=!amd64 !armhf)_ZN7QQmlVMED2Ev at Base 5.0.2
+ (optional=gccinternal|arch=!amd64 !armhf)_ZN7QString5clearEv at Base 5.0.2
_ZN8QJSValue11setPropertyERK7QStringRKS_ at Base 5.0.2
_ZN8QJSValue11setPropertyEjRKS_ at Base 5.0.2
_ZN8QJSValue12setPrototypeERKS_ at Base 5.0.2
@@ -1255,7 +1256,7 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
_ZN8QQmlInfoD1Ev at Base 5.0.2
_ZN8QQmlInfoD2Ev at Base 5.0.2
(optional=templinst|arch=armhf)_ZN8QQmlPool3NewIN17QQmlCompilerTypes18TrBindingReferenceEEEPT_v at Base 5.0.2
- (optional=templinst|arch=amd64 i386)_ZN8QQmlPool3NewINS_11StringClassEEEPT_v at Base 5.0.2
+ (optional=templinst|arch=i386)_ZN8QQmlPool3NewINS_11StringClassEEEPT_v at Base 5.0.2
_ZN8QQmlPool5clearEv at Base 5.0.2
(optional=templinst)_ZN8QQmlPool7destroyIN10QQmlScript13TypeReferenceEEEvPNS_5ClassE at Base 5.0.2
(optional=templinst)_ZN8QQmlPool7destroyIN10QQmlScript6Object11DynamicSlotEEEvPNS_5ClassE at Base 5.0.2
@@ -1589,7 +1590,7 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
_ZNK17QQmlPropertyCache6signalEiPPS_ at Base 5.0.2
_ZNK17QQmlPropertyCache7resolveEP16QQmlPropertyData at Base 5.0.2
_ZNK17QQmlPropertyCache8propertyEi at Base 5.0.2
- (optional=templinst)_ZNK17QQmlPropertyCache8propertyI7QStringEEP16QQmlPropertyDataRKT_P7QObjectP15QQmlContextData at Base 5.0.2
+ (optional=templinst|arch=!amd64)_ZNK17QQmlPropertyCache8propertyI7QStringEEP16QQmlPropertyDataRKT_P7QObjectP15QQmlContextData at Base 5.0.2
_ZNK17QQmlPropertyCache9classNameEv at Base 5.0.2
_ZNK17QQmlRectValueType10metaObjectEv at Base 5.0.2
_ZNK17QQmlRectValueType1xEv at Base 5.0.2
diff --git a/debian/libqt5quickparticles5.symbols b/debian/libqt5quickparticles5.symbols
index 49aba30..55b09dd 100644
--- a/debian/libqt5quickparticles5.symbols
+++ b/debian/libqt5quickparticles5.symbols
@@ -1,12 +1,10 @@
# SymbolsHelper-Confirmed: 5.0.2 amd64 armhf
libQt5QuickParticles.so.5 libqt5quickparticles5 #MINVER#
- (optional=gccinternal)_ZN10QByteArray7reserveEi at Base 5.0.2
(optional=templinst|arch=armhf)_ZN11QMetaMethod10fromSignalIM18QQuickTrailEmitterFv12QQmlV8HandleS2_EEES_T_ at Base 5.0.2
(optional=templinst|arch=armhf)_ZN11QMetaMethod10fromSignalIM20QQuickCustomAffectorFv12QQmlV8HandlefEEES_T_ at Base 5.0.2
(optional=templinst|arch=armhf)_ZN11QMetaMethod10fromSignalIM21QQuickParticleEmitterFv12QQmlV8HandleEEES_T_ at Base 5.0.2
(optional=templinst|arch=armhf)_ZN11QMetaMethod10fromSignalIM22QQuickParticleAffectorFvffEEES_T_ at Base 5.0.2
_ZN21QQuickParticlesModule12defineModuleEv at Base 5.0.2
- (optional=gccinternal)_ZN9QHashData8willGrowEv at Base 5.0.2
_ZTIN9QV8Engine9DeletableE at Base 5.0.2
_ZTSN9QV8Engine9DeletableE at Base 5.0.2
_ZTVN9QV8Engine9DeletableE at Base 5.0.2
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list