[SCM] qtbase packaging branch, experimental, updated. debian/5.2.0+dfsg-7-13-g111c2f6

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Sat Feb 8 14:21:01 UTC 2014


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

The following commit has been merged in the experimental branch:
commit 111c2f6845afd3f2988f573f418aefe324ef277c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Feb 8 11:20:15 2014 -0300

    Bump qtbase-abi to qtbase-abi-5-2-1 due to private symbols changes.
---
 debian/changelog                             | 1 +
 debian/control                               | 2 +-
 debian/libqt5concurrent5.lintian-overrides   | 2 +-
 debian/libqt5concurrent5.symbols             | 2 +-
 debian/libqt5core5a.lintian-overrides        | 2 +-
 debian/libqt5core5a.symbols                  | 2 +-
 debian/libqt5dbus5.lintian-overrides         | 2 +-
 debian/libqt5dbus5.symbols                   | 2 +-
 debian/libqt5gui5.lintian-overrides          | 2 +-
 debian/libqt5gui5.symbols                    | 2 +-
 debian/libqt5network5.lintian-overrides      | 2 +-
 debian/libqt5network5.symbols                | 2 +-
 debian/libqt5opengl5.lintian-overrides       | 2 +-
 debian/libqt5opengl5.symbols                 | 2 +-
 debian/libqt5printsupport5.lintian-overrides | 2 +-
 debian/libqt5printsupport5.symbols           | 2 +-
 debian/libqt5sql5.lintian-overrides          | 2 +-
 debian/libqt5sql5.symbols                    | 2 +-
 debian/libqt5test5.lintian-overrides         | 2 +-
 debian/libqt5test5.symbols                   | 2 +-
 debian/libqt5widgets5.lintian-overrides      | 2 +-
 debian/libqt5widgets5.symbols                | 2 +-
 debian/libqt5xml5.lintian-overrides          | 2 +-
 debian/libqt5xml5.symbols                    | 2 +-
 24 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed278c6..4844fd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qtbase-opensource-src (5.2.1+dfsg-1) UNRELEASED; urgency=medium
     include to qtglobal.h in it and no public symbols are missing.
   * Update symbols files with current build log. All missing symbols where
     private. Private symbols where [re]marked in symbols files.
+  * Bump qtbase-abi to qtbase-abi-5-2-1 due to private symbols changes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Feb 2014 13:06:24 -0300
 
diff --git a/debian/control b/debian/control
index 60a0668..d3d97de 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,7 @@ Package: libqt5core5a
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Provides: qtbase-abi-5-2-0
+Provides: qtbase-abi-5-2-1
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libthai0
 Breaks: libqt5core5 (<< 5.2.0+dfsg~)
diff --git a/debian/libqt5concurrent5.lintian-overrides b/debian/libqt5concurrent5.lintian-overrides
index 03a21bb..17a2a24 100644
--- a/debian/libqt5concurrent5.lintian-overrides
+++ b/debian/libqt5concurrent5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5concurrent5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5concurrent5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5concurrent5.symbols b/debian/libqt5concurrent5.symbols
index 79ce3ff..1b587f9 100644
--- a/debian/libqt5concurrent5.symbols
+++ b/debian/libqt5concurrent5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.0 alpha armel armhf hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc
 libQt5Concurrent.so.5 libqt5concurrent5 #MINVER#
-| libqt5concurrent5 #MINVER#, qtbase-abi-5-2-0
+| libqt5concurrent5 #MINVER#, qtbase-abi-5-2-1
  _ZN12QtConcurrent16BlockSizeManager13timeAfterUserEv at Base 5.0.2
  _ZN12QtConcurrent16BlockSizeManager14timeBeforeUserEv at Base 5.0.2
  _ZN12QtConcurrent16BlockSizeManager9blockSizeEv at Base 5.0.2
diff --git a/debian/libqt5core5a.lintian-overrides b/debian/libqt5core5a.lintian-overrides
index 682c2a5..a531b85 100644
--- a/debian/libqt5core5a.lintian-overrides
+++ b/debian/libqt5core5a.lintian-overrides
@@ -1,5 +1,5 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5core5a: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5core5a: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
 # To help Ubuntu in their releases we also renamed libqt5core5 to libqt5core5a.
 libqt5core5a: package-name-doesnt-match-sonames libQt5Core5
diff --git a/debian/libqt5core5a.symbols b/debian/libqt5core5a.symbols
index a2bf9ea..2501b3b 100644
--- a/debian/libqt5core5a.symbols
+++ b/debian/libqt5core5a.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.1 amd64
 libQt5Core.so.5 libqt5core5a #MINVER#
-| libqt5core5a #MINVER#, qtbase-abi-5-2-0
+| libqt5core5a #MINVER#, qtbase-abi-5-2-1
  _Z10forcepointR11QTextStream at Base 5.0.2
  _Z10noshowbaseR11QTextStream at Base 5.0.2
  _Z10qAllocMoreii at Base 5.0.2
diff --git a/debian/libqt5dbus5.lintian-overrides b/debian/libqt5dbus5.lintian-overrides
index 4abb4e9..fc62352 100644
--- a/debian/libqt5dbus5.lintian-overrides
+++ b/debian/libqt5dbus5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5dbus5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5dbus5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5dbus5.symbols b/debian/libqt5dbus5.symbols
index 29f86cb..6d3c52d 100644
--- a/debian/libqt5dbus5.symbols
+++ b/debian/libqt5dbus5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.0 alpha amd64 armel armhf hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc
 libQt5DBus.so.5 libqt5dbus5 #MINVER#
-| libqt5dbus5 #MINVER#, qtbase-abi-5-2-0
+| libqt5dbus5 #MINVER#, qtbase-abi-5-2-1
  _Z14qDBusReplyFillRK12QDBusMessageR10QDBusErrorR8QVariant at Base 5.0.2
  _Z15qDBusAddSpyHookPFvRK12QDBusMessageE at Base 5.0.2
  _Z18qDBusCheckAsyncTagPKc at Base 5.1.0
diff --git a/debian/libqt5gui5.lintian-overrides b/debian/libqt5gui5.lintian-overrides
index f616251..abd212d 100644
--- a/debian/libqt5gui5.lintian-overrides
+++ b/debian/libqt5gui5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5gui5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5gui5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5gui5.symbols b/debian/libqt5gui5.symbols
index 8e080b3..47dd841 100644
--- a/debian/libqt5gui5.symbols
+++ b/debian/libqt5gui5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.0 alpha amd64 armel armhf hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x sparc
 libQt5Gui.so.5 libqt5gui5 #MINVER#
-| libqt5gui5 #MINVER#, qtbase-abi-5-2-0
+| libqt5gui5 #MINVER#, qtbase-abi-5-2-1
  _Z11qDrawBorderP8QPainterRK5QRectPKN4QCss11BorderStyleEPKiPK6QBrushPK5QSize at Base 5.0.2
  _Z12qTriangulatePKdijRK10QTransform at Base 5.2.0
  _Z12qTriangulateRK11QVectorPathRK10QTransformd at Base 5.2.0 1
diff --git a/debian/libqt5network5.lintian-overrides b/debian/libqt5network5.lintian-overrides
index 8511e5f..80ea44b 100644
--- a/debian/libqt5network5.lintian-overrides
+++ b/debian/libqt5network5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5network5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5network5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5network5.symbols b/debian/libqt5network5.symbols
index 34a0db5..3b22646 100644
--- a/debian/libqt5network5.symbols
+++ b/debian/libqt5network5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.0 alpha amd64 armel armhf hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc
 libQt5Network.so.5 libqt5network5 #MINVER#
-| libqt5network5 #MINVER#, qtbase-abi-5-2-0
+| libqt5network5 #MINVER#, qtbase-abi-5-2-1
  _Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi at Base 5.0.2
  _Z35qNetworkConfigurationManagerPrivatev at Base 5.0.2
  _Z5qHashRK12QHostAddressj at Base 5.0.2
diff --git a/debian/libqt5opengl5.lintian-overrides b/debian/libqt5opengl5.lintian-overrides
index d78377b..68dd6a4 100644
--- a/debian/libqt5opengl5.lintian-overrides
+++ b/debian/libqt5opengl5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5opengl5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5opengl5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5opengl5.symbols b/debian/libqt5opengl5.symbols
index 93e48b5..b18ed4a 100644
--- a/debian/libqt5opengl5.symbols
+++ b/debian/libqt5opengl5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.0~alpha1 i386 amd64
 libQt5OpenGL.so.5 libqt5opengl5 #MINVER#
-| libqt5opengl5 #MINVER#, qtbase-abi-5-2-0
+| libqt5opengl5 #MINVER#, qtbase-abi-5-2-1
  _Z19qt_qgl_paint_enginev at Base 5.0.2
  _ZN10QGLContext10areSharingEPKS_S1_ at Base 5.0.2
  _ZN10QGLContext10currentCtxE at Base 5.0.2
diff --git a/debian/libqt5printsupport5.lintian-overrides b/debian/libqt5printsupport5.lintian-overrides
index 30f7fa6..678f1b3 100644
--- a/debian/libqt5printsupport5.lintian-overrides
+++ b/debian/libqt5printsupport5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5printsupport5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5printsupport5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5printsupport5.symbols b/debian/libqt5printsupport5.symbols
index 213665e..99e7a45 100644
--- a/debian/libqt5printsupport5.symbols
+++ b/debian/libqt5printsupport5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.1 amd64
 libQt5PrintSupport.so.5 libqt5printsupport5 #MINVER#
-| libqt5printsupport5 #MINVER#, qtbase-abi-5-2-0
+| libqt5printsupport5 #MINVER#, qtbase-abi-5-2-1
  _Z19qt_printerPaperSizeN8QPrinter11OrientationEN17QPagedPaintDevice8PageSizeENS_4UnitEi at Base 5.0.2
  _Z20qt_multiplierForUnitN8QPrinter4UnitEi at Base 5.0.2
  _Z27qt_SizeFromUnitToMillimeterRK6QSizeFN8QPrinter4UnitEd at Base 5.2.0~alpha1
diff --git a/debian/libqt5sql5.lintian-overrides b/debian/libqt5sql5.lintian-overrides
index 3af526c..391d98d 100644
--- a/debian/libqt5sql5.lintian-overrides
+++ b/debian/libqt5sql5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5sql5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5sql5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5sql5.symbols b/debian/libqt5sql5.symbols
index 4385fc6..bc00efb 100644
--- a/debian/libqt5sql5.symbols
+++ b/debian/libqt5sql5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.0~alpha1 i386 amd64
 libQt5Sql.so.5 libqt5sql5 #MINVER#
-| libqt5sql5 #MINVER#, qtbase-abi-5-2-0
+| libqt5sql5 #MINVER#, qtbase-abi-5-2-1
  _ZN10QSqlDriver11cancelQueryEv at Base 5.0.2
  _ZN10QSqlDriver11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.0.2
  _ZN10QSqlDriver11qt_metacastEPKc at Base 5.0.2
diff --git a/debian/libqt5test5.lintian-overrides b/debian/libqt5test5.lintian-overrides
index b937dd4..b0d5735 100644
--- a/debian/libqt5test5.lintian-overrides
+++ b/debian/libqt5test5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5test5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5test5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5test5.symbols b/debian/libqt5test5.symbols
index cfc3ebc..0a95091 100644
--- a/debian/libqt5test5.symbols
+++ b/debian/libqt5test5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.0 alpha amd64 armel hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc
 libQt5Test.so.5 libqt5test5 #MINVER#
-| libqt5test5 #MINVER#, qtbase-abi-5-2-0
+| libqt5test5 #MINVER#, qtbase-abi-5-2-1
  _ZN10QTestTable15globalTestTableEv at Base 5.0.2 1
  _ZN10QTestTable16currentTestTableEv at Base 5.0.2 1
  _ZN10QTestTable20clearGlobalTestTableEv at Base 5.0.2 1
diff --git a/debian/libqt5widgets5.lintian-overrides b/debian/libqt5widgets5.lintian-overrides
index 13ac316..cf7444c 100644
--- a/debian/libqt5widgets5.lintian-overrides
+++ b/debian/libqt5widgets5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5widgets5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5widgets5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5widgets5.symbols b/debian/libqt5widgets5.symbols
index 5180416..0d0eb4c 100644
--- a/debian/libqt5widgets5.symbols
+++ b/debian/libqt5widgets5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.1 amd64
 libQt5Widgets.so.5 libqt5widgets5 #MINVER#
-| libqt5widgets5 #MINVER#, qtbase-abi-5-2-0
+| libqt5widgets5 #MINVER#, qtbase-abi-5-2-1
  _Z11qFadeEffectP7QWidgeti at Base 5.0.2
  _Z12qt_accHotKeyRK7QString at Base 5.0.2
  _Z12qt_blurImageP8QPainterR6QImagedbbi at Base 5.2.0
diff --git a/debian/libqt5xml5.lintian-overrides b/debian/libqt5xml5.lintian-overrides
index d8c5e1f..86b5084 100644
--- a/debian/libqt5xml5.lintian-overrides
+++ b/debian/libqt5xml5.lintian-overrides
@@ -1,3 +1,3 @@
 # This dependency has been added to track external packages building against
 # our private headers. It is ok if internal packages depend on the ABI one.
-libqt5xml5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-0
+libqt5xml5: symbols-declares-dependency-on-other-package qtbase-abi-5-2-1
diff --git a/debian/libqt5xml5.symbols b/debian/libqt5xml5.symbols
index 24e651d..251ec08 100644
--- a/debian/libqt5xml5.symbols
+++ b/debian/libqt5xml5.symbols
@@ -1,6 +1,6 @@
 # SymbolsHelper-Confirmed: 5.2.0 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc
 libQt5Xml.so.5 libqt5xml5 #MINVER#
-| libqt5xml5 #MINVER#, qtbase-abi-5-2-0
+| libqt5xml5 #MINVER#, qtbase-abi-5-2-1
  (optional=gccinternal|arch=sparc)_ZN10QByteArray4dataEv at Base 5.2.0
  _ZN10QDomEntityC1EP17QDomEntityPrivate at Base 5.0.2
  _ZN10QDomEntityC1ERKS_ at Base 5.0.2

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list