[SCM] qtbase packaging branch, master, updated. debian/5.3.1+dfsg-1-12-g3d2148a
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Sat Jun 28 02:40:21 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=64c1ff2
The following commit has been merged in the master branch:
commit 64c1ff252389697c98bbf119f7f1ee5b4ae6fa21
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Jun 27 16:38:14 2014 -0300
Bump qtbase-abi to 5-3-1.
---
debian/changelog | 3 +++
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, 26 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 79d596c..dbd87ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qtbase-opensource-src (5.3.1+dfsg-2) UNRELEASED; urgency=medium
- Add NEWS file with this information.
* Make qtbase5-dev suggest libegl1-mesa-dev and libgl1-mesa-dev, as they
might be needed by those using EGL.
+ * Bump qtbase-abi to 5-3-1. Sune found that there is a runtime check that
+ forces us to do a transition for private symbols even on point releases
+ without symbols changes (Closes: #752889).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 26 Jun 2014 10:10:31 -0300
diff --git a/debian/control b/debian/control
index d478b20..d0b13a4 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Package: libqt5core5a
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Provides: qtbase-abi-5-3-0
+Provides: qtbase-abi-5-3-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 37c1979..09b4bba 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-3-0
+libqt5concurrent5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5concurrent5.symbols b/debian/libqt5concurrent5.symbols
index 2f7e48c..82bdbf3 100644
--- a/debian/libqt5concurrent5.symbols
+++ b/debian/libqt5concurrent5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.1 amd64
libQt5Concurrent.so.5 libqt5concurrent5 #MINVER#
-| libqt5concurrent5 #MINVER#, qtbase-abi-5-3-0
+| libqt5concurrent5 #MINVER#, qtbase-abi-5-3-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 342a857..b0b39ff 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-3-0
+libqt5core5a: symbols-declares-dependency-on-other-package qtbase-abi-5-3-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 0b7f6a3..067c3d6 100644
--- a/debian/libqt5core5a.symbols
+++ b/debian/libqt5core5a.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.1 amd64
libQt5Core.so.5 libqt5core5a #MINVER#
-| libqt5core5a #MINVER#, qtbase-abi-5-3-0
+| libqt5core5a #MINVER#, qtbase-abi-5-3-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 5175323..9754182 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-3-0
+libqt5dbus5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5dbus5.symbols b/debian/libqt5dbus5.symbols
index b3b32c0..a624664 100644
--- a/debian/libqt5dbus5.symbols
+++ b/debian/libqt5dbus5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.0 amd64 sparc
libQt5DBus.so.5 libqt5dbus5 #MINVER#
-| libqt5dbus5 #MINVER#, qtbase-abi-5-3-0
+| libqt5dbus5 #MINVER#, qtbase-abi-5-3-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 2c8a63b..26401cd 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-3-0
+libqt5gui5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5gui5.symbols b/debian/libqt5gui5.symbols
index 6cb214c..189bf40 100644
--- a/debian/libqt5gui5.symbols
+++ b/debian/libqt5gui5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.1 amd64
libQt5Gui.so.5 libqt5gui5 #MINVER#
-| libqt5gui5 #MINVER#, qtbase-abi-5-3-0
+| libqt5gui5 #MINVER#, qtbase-abi-5-3-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 810e6d8..b824937 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-3-0
+libqt5network5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5network5.symbols b/debian/libqt5network5.symbols
index 0b7c74f..cbb0cef 100644
--- a/debian/libqt5network5.symbols
+++ b/debian/libqt5network5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.1 amd64
libQt5Network.so.5 libqt5network5 #MINVER#
-| libqt5network5 #MINVER#, qtbase-abi-5-3-0
+| libqt5network5 #MINVER#, qtbase-abi-5-3-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 90612c5..b16fbb2 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-3-0
+libqt5opengl5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5opengl5.symbols b/debian/libqt5opengl5.symbols
index d281b6a..039b231 100644
--- a/debian/libqt5opengl5.symbols
+++ b/debian/libqt5opengl5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.0 amd64
libQt5OpenGL.so.5 libqt5opengl5 #MINVER#
-| libqt5opengl5 #MINVER#, qtbase-abi-5-3-0
+| libqt5opengl5 #MINVER#, qtbase-abi-5-3-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 adad78f..17540de 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-3-0
+libqt5printsupport5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5printsupport5.symbols b/debian/libqt5printsupport5.symbols
index b7bfade..ce4cd5c 100644
--- a/debian/libqt5printsupport5.symbols
+++ b/debian/libqt5printsupport5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.0 amd64
libQt5PrintSupport.so.5 libqt5printsupport5 #MINVER#
-| libqt5printsupport5 #MINVER#, qtbase-abi-5-3-0
+| libqt5printsupport5 #MINVER#, qtbase-abi-5-3-1
_Z19qt_printerPaperSizeN8QPrinter11OrientationEN17QPagedPaintDevice8PageSizeENS_4UnitEi at Base 5.0.2
_Z20qt_multiplierForUnitN8QPrinter4UnitEi at Base 5.0.2
_ZN12QCUPSSupport10setJobHoldEP8QPrinterNS_12JobHoldUntilERK5QTime at Base 5.2.0~alpha1 1
diff --git a/debian/libqt5sql5.lintian-overrides b/debian/libqt5sql5.lintian-overrides
index efeda02..e0b2a37 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-3-0
+libqt5sql5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5sql5.symbols b/debian/libqt5sql5.symbols
index 4e1cddd..a14307d 100644
--- a/debian/libqt5sql5.symbols
+++ b/debian/libqt5sql5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.0 amd64
libQt5Sql.so.5 libqt5sql5 #MINVER#
-| libqt5sql5 #MINVER#, qtbase-abi-5-3-0
+| libqt5sql5 #MINVER#, qtbase-abi-5-3-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 55954e6..17cd999 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-3-0
+libqt5test5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5test5.symbols b/debian/libqt5test5.symbols
index 0c50d6b..d7c52fc 100644
--- a/debian/libqt5test5.symbols
+++ b/debian/libqt5test5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.0 amd64 sparc
libQt5Test.so.5 libqt5test5 #MINVER#
-| libqt5test5 #MINVER#, qtbase-abi-5-3-0
+| libqt5test5 #MINVER#, qtbase-abi-5-3-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 6ed7f94..363656f 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-3-0
+libqt5widgets5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5widgets5.symbols b/debian/libqt5widgets5.symbols
index f06c4c1..7776b0e 100644
--- a/debian/libqt5widgets5.symbols
+++ b/debian/libqt5widgets5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.3.1 amd64
libQt5Widgets.so.5 libqt5widgets5 #MINVER#
-| libqt5widgets5 #MINVER#, qtbase-abi-5-3-0
+| libqt5widgets5 #MINVER#, qtbase-abi-5-3-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 c719e98..3dce553 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-3-0
+libqt5xml5: symbols-declares-dependency-on-other-package qtbase-abi-5-3-1
diff --git a/debian/libqt5xml5.symbols b/debian/libqt5xml5.symbols
index 086445f..780c0ea 100644
--- a/debian/libqt5xml5.symbols
+++ b/debian/libqt5xml5.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 5.2.1 sparc
libQt5Xml.so.5 libqt5xml5 #MINVER#
-| libqt5xml5 #MINVER#, qtbase-abi-5-3-0
+| libqt5xml5 #MINVER#, qtbase-abi-5-3-1
_ZN10QDomEntityC1EP17QDomEntityPrivate at Base 5.0.2
_ZN10QDomEntityC1ERKS_ at Base 5.0.2
_ZN10QDomEntityC1Ev at Base 5.0.2
--
qtbase packaging
More information about the pkg-kde-commits
mailing list