[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-1-7-gffe548b

Dmitry Shachnev mitya57 at moszumanska.debian.org
Mon Mar 2 14:56:44 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=ffe548b

The following commit has been merged in the experimental branch:
commit ffe548b04569aca47a7ce0b3118bad4a7910a707
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Mar 2 17:56:26 2015 +0300

    mark_private_symbols.sh: Strip trailing colon from symbols names.
---
 debian/changelog               |  2 ++
 debian/libqt5gui5.symbols      | 22 +++++++++----------
 debian/libqt5sql5.symbols      | 48 +++++++++++++++++++++---------------------
 debian/libqt5widgets5.symbols  | 40 +++++++++++++++++------------------
 debian/mark_private_symbols.sh |  1 +
 5 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bd4fc6..a1fb084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 qtbase-opensource-src (5.4.1+dfsg-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
+  * mark_private_symbols.sh: Strip trailing colon from symbols names.
   * Symbols files:
     - Update from buildds’ logs.
     - Mark symbols missing with GCC 5 as optional.
+    - Update for the above mark_private_symbols.sh change.
   * Drop obsolete override_dh_makeshlibs code, no longer needed.
     Just use dh_makeshlibs -V instead.
 
diff --git a/debian/libqt5gui5.symbols b/debian/libqt5gui5.symbols
index a9d8525..1242a5b 100644
--- a/debian/libqt5gui5.symbols
+++ b/debian/libqt5gui5.symbols
@@ -3491,13 +3491,13 @@ libQt5Gui.so.5 libqt5gui5 #MINVER#
  _ZN28QPlatformMessageDialogHelper11qt_metacastEPKc at Base 5.2.0~alpha1 1
  _ZN28QPlatformMessageDialogHelper16staticMetaObjectE at Base 5.2.0~alpha1 1
  _ZN28QPlatformMessageDialogHelper7clickedEN21QPlatformDialogHelper14StandardButtonENS0_10ButtonRoleE at Base 5.3.0 1
- _ZN28QPlatformSharedGraphicsCache11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.0.2
- _ZN28QPlatformSharedGraphicsCache11qt_metacastEPKc at Base 5.0.2
- _ZN28QPlatformSharedGraphicsCache12itemsMissingERK10QByteArrayRK7QVectorIjE at Base 5.0.2
- _ZN28QPlatformSharedGraphicsCache12itemsUpdatedERK10QByteArrayPvRK7QVectorIjERKS4_I6QPointE at Base 5.0.2
- _ZN28QPlatformSharedGraphicsCache14itemsAvailableERK10QByteArrayPvRK7QVectorIjERKS4_I6QPointE at Base 5.0.2
- _ZN28QPlatformSharedGraphicsCache16itemsInvalidatedERK10QByteArrayRK7QVectorIjE at Base 5.0.2
- _ZN28QPlatformSharedGraphicsCache16staticMetaObjectE at Base 5.0.2
+ _ZN28QPlatformSharedGraphicsCache11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.0.2 1
+ _ZN28QPlatformSharedGraphicsCache11qt_metacastEPKc at Base 5.0.2 1
+ _ZN28QPlatformSharedGraphicsCache12itemsMissingERK10QByteArrayRK7QVectorIjE at Base 5.0.2 1
+ _ZN28QPlatformSharedGraphicsCache12itemsUpdatedERK10QByteArrayPvRK7QVectorIjERKS4_I6QPointE at Base 5.0.2 1
+ _ZN28QPlatformSharedGraphicsCache14itemsAvailableERK10QByteArrayPvRK7QVectorIjERKS4_I6QPointE at Base 5.0.2 1
+ _ZN28QPlatformSharedGraphicsCache16itemsInvalidatedERK10QByteArrayRK7QVectorIjE at Base 5.0.2 1
+ _ZN28QPlatformSharedGraphicsCache16staticMetaObjectE at Base 5.0.2 1
  _ZN29QScreenOrientationChangeEventC1EP7QScreenN2Qt17ScreenOrientationE at Base 5.0.2
  _ZN29QScreenOrientationChangeEventC2EP7QScreenN2Qt17ScreenOrientationE at Base 5.0.2
  _ZN29QScreenOrientationChangeEventD0Ev at Base 5.0.2
@@ -5875,7 +5875,7 @@ libQt5Gui.so.5 libqt5gui5 #MINVER#
  _ZNK28QApplicationStateChangeEvent16applicationStateEv at Base 5.1.0
  _ZNK28QPlatformMessageDialogHelper10metaObjectEv at Base 5.2.0~alpha1 1
  _ZNK28QPlatformMessageDialogHelper7optionsEv at Base 5.2.0~alpha1 1
- _ZNK28QPlatformSharedGraphicsCache10metaObjectEv at Base 5.0.2
+ _ZNK28QPlatformSharedGraphicsCache10metaObjectEv at Base 5.0.2 1
  _ZNK29QScreenOrientationChangeEvent11orientationEv at Base 5.0.2
  _ZNK29QScreenOrientationChangeEvent6screenEv at Base 5.0.2
  _ZNK30QOpenGLFramebufferObjectFormat10attachmentEv at Base 5.0.2
@@ -6665,7 +6665,7 @@ libQt5Gui.so.5 libqt5gui5 #MINVER#
  _ZTI27QRegularExpressionValidator at Base 5.1.0
  _ZTI28QApplicationStateChangeEvent at Base 5.1.0
  _ZTI28QPlatformMessageDialogHelper at Base 5.2.0~alpha1 1
- _ZTI28QPlatformSharedGraphicsCache at Base 5.0.2
+ _ZTI28QPlatformSharedGraphicsCache at Base 5.0.2 1
  _ZTI29QScreenOrientationChangeEvent at Base 5.0.2
  (arch=!armel !armhf)_ZTI34QOpenGLFunctions_3_2_Compatibility at Base 5.1.0
  (arch=!armel !armhf)_ZTI34QOpenGLFunctions_3_3_Compatibility at Base 5.1.0
@@ -6903,7 +6903,7 @@ libQt5Gui.so.5 libqt5gui5 #MINVER#
  _ZTS27QRegularExpressionValidator at Base 5.1.0
  _ZTS28QApplicationStateChangeEvent at Base 5.1.0
  _ZTS28QPlatformMessageDialogHelper at Base 5.2.0~alpha1 1
- _ZTS28QPlatformSharedGraphicsCache at Base 5.0.2
+ _ZTS28QPlatformSharedGraphicsCache at Base 5.0.2 1
  _ZTS29QScreenOrientationChangeEvent at Base 5.0.2
  (arch=!armel !armhf)_ZTS34QOpenGLFunctions_3_2_Compatibility at Base 5.1.0
  (arch=!armel !armhf)_ZTS34QOpenGLFunctions_3_3_Compatibility at Base 5.1.0
@@ -7139,7 +7139,7 @@ libQt5Gui.so.5 libqt5gui5 #MINVER#
  _ZTV27QRegularExpressionValidator at Base 5.1.0
  _ZTV28QApplicationStateChangeEvent at Base 5.1.0
  _ZTV28QPlatformMessageDialogHelper at Base 5.2.0~alpha1 1
- _ZTV28QPlatformSharedGraphicsCache at Base 5.0.2
+ _ZTV28QPlatformSharedGraphicsCache at Base 5.0.2 1
  _ZTV29QScreenOrientationChangeEvent at Base 5.0.2
  (arch=!armel !armhf)_ZTV34QOpenGLFunctions_3_2_Compatibility at Base 5.1.0
  (arch=!armel !armhf)_ZTV34QOpenGLFunctions_3_3_Compatibility at Base 5.1.0
diff --git a/debian/libqt5sql5.symbols b/debian/libqt5sql5.symbols
index 8bb8791..5413b94 100644
--- a/debian/libqt5sql5.symbols
+++ b/debian/libqt5sql5.symbols
@@ -173,26 +173,26 @@ libQt5Sql.so.5 libqt5sql5 #MINVER#
  _ZN14QSqlTableModelD0Ev at Base 5.0.2
  _ZN14QSqlTableModelD1Ev at Base 5.0.2
  _ZN14QSqlTableModelD2Ev at Base 5.0.2
- _ZN16QSqlCachedResult10fetchFirstEv at Base 5.0.2
- _ZN16QSqlCachedResult11clearValuesEv at Base 5.0.2
- _ZN16QSqlCachedResult12virtual_hookEiPv at Base 5.0.2
- _ZN16QSqlCachedResult13fetchPreviousEv at Base 5.0.2
- _ZN16QSqlCachedResult19detachFromResultSetEv at Base 5.0.2
- _ZN16QSqlCachedResult27setNumericalPrecisionPolicyEN4QSql24NumericalPrecisionPolicyE at Base 5.0.2
- _ZN16QSqlCachedResult4dataEi at Base 5.0.2
- _ZN16QSqlCachedResult4initEi at Base 5.0.2
- _ZN16QSqlCachedResult5cacheEv at Base 5.0.2
- _ZN16QSqlCachedResult5fetchEi at Base 5.0.2
- _ZN16QSqlCachedResult6isNullEi at Base 5.0.2
- _ZN16QSqlCachedResult7cleanupEv at Base 5.0.2
- _ZN16QSqlCachedResult9cacheNextEv at Base 5.0.2
- _ZN16QSqlCachedResult9fetchLastEv at Base 5.0.2
- _ZN16QSqlCachedResult9fetchNextEv at Base 5.0.2
- _ZN16QSqlCachedResultC1EPK10QSqlDriver at Base 5.0.2
- _ZN16QSqlCachedResultC2EPK10QSqlDriver at Base 5.0.2
- _ZN16QSqlCachedResultD0Ev at Base 5.0.2
- _ZN16QSqlCachedResultD1Ev at Base 5.0.2
- _ZN16QSqlCachedResultD2Ev at Base 5.0.2
+ _ZN16QSqlCachedResult10fetchFirstEv at Base 5.0.2 1
+ _ZN16QSqlCachedResult11clearValuesEv at Base 5.0.2 1
+ _ZN16QSqlCachedResult12virtual_hookEiPv at Base 5.0.2 1
+ _ZN16QSqlCachedResult13fetchPreviousEv at Base 5.0.2 1
+ _ZN16QSqlCachedResult19detachFromResultSetEv at Base 5.0.2 1
+ _ZN16QSqlCachedResult27setNumericalPrecisionPolicyEN4QSql24NumericalPrecisionPolicyE at Base 5.0.2 1
+ _ZN16QSqlCachedResult4dataEi at Base 5.0.2 1
+ _ZN16QSqlCachedResult4initEi at Base 5.0.2 1
+ _ZN16QSqlCachedResult5cacheEv at Base 5.0.2 1
+ _ZN16QSqlCachedResult5fetchEi at Base 5.0.2 1
+ _ZN16QSqlCachedResult6isNullEi at Base 5.0.2 1
+ _ZN16QSqlCachedResult7cleanupEv at Base 5.0.2 1
+ _ZN16QSqlCachedResult9cacheNextEv at Base 5.0.2 1
+ _ZN16QSqlCachedResult9fetchLastEv at Base 5.0.2 1
+ _ZN16QSqlCachedResult9fetchNextEv at Base 5.0.2 1
+ _ZN16QSqlCachedResultC1EPK10QSqlDriver at Base 5.0.2 1
+ _ZN16QSqlCachedResultC2EPK10QSqlDriver at Base 5.0.2 1
+ _ZN16QSqlCachedResultD0Ev at Base 5.0.2 1
+ _ZN16QSqlCachedResultD1Ev at Base 5.0.2 1
+ _ZN16QSqlCachedResultD2Ev at Base 5.0.2 1
  _ZN16QSqlDriverPlugin11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.0.2
  _ZN16QSqlDriverPlugin11qt_metacastEPKc at Base 5.0.2
  _ZN16QSqlDriverPlugin16staticMetaObjectE at Base 5.0.2
@@ -397,7 +397,7 @@ libQt5Sql.so.5 libqt5sql5 #MINVER#
  _ZNK14QSqlTableModel8databaseEv at Base 5.0.2
  _ZNK14QSqlTableModel8rowCountERK11QModelIndex at Base 5.0.2
  _ZNK14QSqlTableModel9tableNameEv at Base 5.0.2
- _ZNK16QSqlCachedResult8colCountEv at Base 5.0.2
+ _ZNK16QSqlCachedResult8colCountEv at Base 5.0.2 1
  _ZNK16QSqlDriverPlugin10metaObjectEv at Base 5.0.2
  _ZNK17QSqlResultPrivate11fieldSerialEi at Base 5.1.0 1
  _ZNK17QSqlResultPrivate24positionalToNamedBindingERK7QString at Base 5.1.0 1
@@ -458,7 +458,7 @@ libQt5Sql.so.5 libqt5sql5 #MINVER#
  _ZTI10QSqlResult at Base 5.0.2
  _ZTI14QSqlQueryModel at Base 5.0.2
  _ZTI14QSqlTableModel at Base 5.0.2
- _ZTI16QSqlCachedResult at Base 5.0.2
+ _ZTI16QSqlCachedResult at Base 5.0.2 1
  _ZTI16QSqlDriverPlugin at Base 5.0.2
  _ZTI17QSqlResultPrivate at Base 5.1.0 1
  _ZTI24QSqlRelationalTableModel at Base 5.0.2
@@ -467,7 +467,7 @@ libQt5Sql.so.5 libqt5sql5 #MINVER#
  _ZTS10QSqlResult at Base 5.0.2
  _ZTS14QSqlQueryModel at Base 5.0.2
  _ZTS14QSqlTableModel at Base 5.0.2
- _ZTS16QSqlCachedResult at Base 5.0.2
+ _ZTS16QSqlCachedResult at Base 5.0.2 1
  _ZTS16QSqlDriverPlugin at Base 5.0.2
  _ZTS17QSqlResultPrivate at Base 5.1.0 1
  _ZTS24QSqlRelationalTableModel at Base 5.0.2
@@ -476,7 +476,7 @@ libQt5Sql.so.5 libqt5sql5 #MINVER#
  _ZTV10QSqlResult at Base 5.0.2
  _ZTV14QSqlQueryModel at Base 5.0.2
  _ZTV14QSqlTableModel at Base 5.0.2
- _ZTV16QSqlCachedResult at Base 5.0.2
+ _ZTV16QSqlCachedResult at Base 5.0.2 1
  _ZTV16QSqlDriverPlugin at Base 5.0.2
  _ZTV17QSqlResultPrivate at Base 5.1.0 1
  _ZTV24QSqlRelationalTableModel at Base 5.0.2
diff --git a/debian/libqt5widgets5.symbols b/debian/libqt5widgets5.symbols
index cd30ef8..218f255 100644
--- a/debian/libqt5widgets5.symbols
+++ b/debian/libqt5widgets5.symbols
@@ -3182,9 +3182,9 @@ libQt5Widgets.so.5 libqt5widgets5 #MINVER#
  _ZN19QAbstractScrollArea5eventEP6QEvent at Base 5.0.2
  _ZN19QAbstractScrollArea9dropEventEP10QDropEvent at Base 5.0.2
  _ZN19QAbstractScrollAreaC1EP7QWidget at Base 5.0.2
- _ZN19QAbstractScrollAreaC1ER26QAbstractScrollAreaPrivateP7QWidget at Base 5.0.2
+ _ZN19QAbstractScrollAreaC1ER26QAbstractScrollAreaPrivateP7QWidget at Base 5.0.2 1
  _ZN19QAbstractScrollAreaC2EP7QWidget at Base 5.0.2
- _ZN19QAbstractScrollAreaC2ER26QAbstractScrollAreaPrivateP7QWidget at Base 5.0.2
+ _ZN19QAbstractScrollAreaC2ER26QAbstractScrollAreaPrivateP7QWidget at Base 5.0.2 1
  _ZN19QAbstractScrollAreaD0Ev at Base 5.0.2
  _ZN19QAbstractScrollAreaD1Ev at Base 5.0.2
  _ZN19QAbstractScrollAreaD2Ev at Base 5.0.2
@@ -3897,20 +3897,20 @@ libQt5Widgets.so.5 libqt5widgets5 #MINVER#
  _ZN26QAbstractGraphicsShapeItemD0Ev at Base 5.0.2
  _ZN26QAbstractGraphicsShapeItemD1Ev at Base 5.0.2
  _ZN26QAbstractGraphicsShapeItemD2Ev at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate14layoutChildrenEv at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate15flashScrollBarsEv at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate16replaceScrollBarEP10QScrollBarN2Qt11OrientationE at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate19canStartScrollingAtERK6QPoint at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate21setScrollBarTransientEP10QScrollBarb at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate23_q_showOrHideScrollBarsEv at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate4initEv at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate9_q_hslideEi at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivate9_q_vslideEi at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivateC1Ev at Base 5.0.2
- _ZN26QAbstractScrollAreaPrivateC2Ev at Base 5.0.2
- (optional=gccinternal)_ZN26QAbstractScrollAreaPrivateD0Ev at Base 5.0.2
- (optional=gccinternal)_ZN26QAbstractScrollAreaPrivateD1Ev at Base 5.0.2
- (optional=gccinternal)_ZN26QAbstractScrollAreaPrivateD2Ev at Base 5.0.2
+ _ZN26QAbstractScrollAreaPrivate14layoutChildrenEv at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivate15flashScrollBarsEv at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivate16replaceScrollBarEP10QScrollBarN2Qt11OrientationE at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivate19canStartScrollingAtERK6QPoint at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivate21setScrollBarTransientEP10QScrollBarb at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivate23_q_showOrHideScrollBarsEv at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivate4initEv at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivate9_q_hslideEi at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivate9_q_vslideEi at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivateC1Ev at Base 5.0.2 1
+ _ZN26QAbstractScrollAreaPrivateC2Ev at Base 5.0.2 1
+ (optional=gccinternal)_ZN26QAbstractScrollAreaPrivateD0Ev at Base 5.0.2 1
+ (optional=gccinternal)_ZN26QAbstractScrollAreaPrivateD1Ev at Base 5.0.2 1
+ (optional=gccinternal)_ZN26QAbstractScrollAreaPrivateD2Ev at Base 5.0.2 1
  (optional=gccinternal)_ZN26QAccessibleTextCursorEventD0Ev at Base 5.0.2
  (optional=gccinternal)_ZN26QAccessibleTextCursorEventD1Ev at Base 5.0.2
  (optional=gccinternal)_ZN26QAccessibleTextCursorEventD2Ev at Base 5.0.2
@@ -6917,7 +6917,7 @@ libQt5Widgets.so.5 libqt5widgets5 #MINVER#
  _ZNK26QAbstractGraphicsShapeItem12isObscuredByEPK13QGraphicsItem at Base 5.0.2
  _ZNK26QAbstractGraphicsShapeItem3penEv at Base 5.0.2
  _ZNK26QAbstractGraphicsShapeItem5brushEv at Base 5.0.2
- _ZNK26QAbstractScrollAreaPrivate14contentsOffsetEv at Base 5.0.2
+ _ZNK26QAbstractScrollAreaPrivate14contentsOffsetEv at Base 5.0.2 1
  _ZNK27QGraphicsSceneDragDropEvent10dropActionEv at Base 5.0.2
  _ZNK27QGraphicsSceneDragDropEvent14proposedActionEv at Base 5.0.2
  _ZNK27QGraphicsSceneDragDropEvent15possibleActionsEv at Base 5.0.2
@@ -7675,7 +7675,7 @@ libQt5Widgets.so.5 libqt5widgets5 #MINVER#
  _ZTI25QGraphicsSceneResizeEvent at Base 5.0.2
  _ZTI25QOpenGLPaintDevicePrivate at Base 5.4.0 1
  _ZTI26QAbstractGraphicsShapeItem at Base 5.0.2
- _ZTI26QAbstractScrollAreaPrivate at Base 5.0.2
+ _ZTI26QAbstractScrollAreaPrivate at Base 5.0.2 1
  _ZTI26QAccessibleTextCursorEvent at Base 5.0.2
  _ZTI26QAccessibleTextInsertEvent at Base 5.0.2
  _ZTI26QAccessibleTextRemoveEvent at Base 5.0.2
@@ -7882,7 +7882,7 @@ libQt5Widgets.so.5 libqt5widgets5 #MINVER#
  _ZTS25QGraphicsSceneResizeEvent at Base 5.0.2
  _ZTS25QOpenGLPaintDevicePrivate at Base 5.4.0 1
  _ZTS26QAbstractGraphicsShapeItem at Base 5.0.2
- _ZTS26QAbstractScrollAreaPrivate at Base 5.0.2
+ _ZTS26QAbstractScrollAreaPrivate at Base 5.0.2 1
  _ZTS26QAccessibleTextCursorEvent at Base 5.0.2
  _ZTS26QAccessibleTextInsertEvent at Base 5.0.2
  _ZTS26QAccessibleTextRemoveEvent at Base 5.0.2
@@ -8089,7 +8089,7 @@ libQt5Widgets.so.5 libqt5widgets5 #MINVER#
  _ZTV25QGraphicsSceneResizeEvent at Base 5.0.2
  _ZTV25QOpenGLPaintDevicePrivate at Base 5.4.0 1
  _ZTV26QAbstractGraphicsShapeItem at Base 5.0.2
- _ZTV26QAbstractScrollAreaPrivate at Base 5.0.2
+ _ZTV26QAbstractScrollAreaPrivate at Base 5.0.2 1
  _ZTV26QAccessibleTextCursorEvent at Base 5.0.2
  _ZTV26QAccessibleTextInsertEvent at Base 5.0.2
  _ZTV26QAccessibleTextRemoveEvent at Base 5.0.2
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 53d7159..82bcf5a 100755
--- a/debian/mark_private_symbols.sh
+++ b/debian/mark_private_symbols.sh
@@ -66,6 +66,7 @@ grep -rh class ${PRIVATE_HEADERS} |
 	grep EXPORT | 
 	while read class export classname rest 
 	do
+		classname=$(echo $classname | sed 's/://')
 		echo ${#classname}${classname} 
 	done | 
 	while read privateclass 

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list