[SCM] qtbase packaging branch, experimental, updated. debian/5.3.0+dfsg-5-2-g193a6ec

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Wed Jun 25 21:57:46 UTC 2014


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

The following commit has been merged in the experimental branch:
commit 92cdaef33fc1a871276bd2a9b8d28198a1115a84
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jun 7 18:29:12 2014 -0300

    Also update symbols files with current build log.
---
 debian/changelog                 | 2 +-
 debian/libqt5concurrent5.symbols | 4 ++--
 debian/libqt5widgets5.symbols    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d43fa9c..bee9a68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ qtbase-opensource-src (5.3.0+dfsg-5) UNRELEASED; urgency=medium
   * Remove enable_sparc_detection.patch. This is causing a FTBFS in sparc now.
     I've contacted upstream to know the best way to go from here, in the
     meantime we just don't detect it.
-  * Update symbols files with buildds' logs.
+  * Update symbols files with buildds' and current logs.
   * Install only the last (and more relevant) changelog. We were trying (and
     failing) to install all of them, but only the first one would end up as
     changelog. As the listing order varies between archs, the final changelog
diff --git a/debian/libqt5concurrent5.symbols b/debian/libqt5concurrent5.symbols
index 747df7c..9b533d1 100644
--- a/debian/libqt5concurrent5.symbols
+++ b/debian/libqt5concurrent5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 5.3.0 alpha arm64 armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x
+# SymbolsHelper-Confirmed: 5.3.0 alpha amd64 arm64 armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x
 libQt5Concurrent.so.5 libqt5concurrent5 #MINVER#
 | libqt5concurrent5 #MINVER#, qtbase-abi-5-3-0
  _ZN12QtConcurrent16BlockSizeManager13timeAfterUserEv at Base 5.0.2
@@ -26,7 +26,7 @@ libQt5Concurrent.so.5 libqt5concurrent5 #MINVER#
  _ZN12QtConcurrent16ThreadEngineBaseD0Ev at Base 5.0.2
  _ZN12QtConcurrent16ThreadEngineBaseD1Ev at Base 5.0.2
  _ZN12QtConcurrent16ThreadEngineBaseD2Ev at Base 5.0.2
- (optional=templinst|arch=!alpha !arm64 !kfreebsd-amd64 !s390x)_ZSt13__adjust_heapIPdidEvT_T0_S2_T1_ at Base 5.3.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !s390x)_ZSt13__adjust_heapIPdidEvT_T0_S2_T1_ at Base 5.3.0
  (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 ppc64 s390x sparc64)_ZSt13__adjust_heapIPdldEvT_T0_S2_T1_ at Base 5.2.0~alpha1
  (optional=templinst|subst)_ZSt13__introselectIPd{ssize_t}EvT_S1_S1_T0_ at Base 5.2.0~alpha1
  (optional=templinst|arch=ia64 sparc)_ZSt16__insertion_sortIPdEvT_S1_ at Base 5.2.0
diff --git a/debian/libqt5widgets5.symbols b/debian/libqt5widgets5.symbols
index 967ce7c..d9c58e7 100644
--- a/debian/libqt5widgets5.symbols
+++ b/debian/libqt5widgets5.symbols
@@ -7524,6 +7524,7 @@ libQt5Widgets.so.5 libqt5widgets5 #MINVER#
  (optional=templinst|arch=ia64 powerpcspe s390 sparc)_ZSt16__introsort_loopIN5QListIP13QGraphicsItemE8iteratorEiPFbPKS1_S6_EEvT_S9_T0_T1_ at Base 5.0.2
  (optional=templinst|arch=ia64 powerpcspe s390 sparc)_ZSt16__introsort_loopIN5QListIP13QGraphicsItemE8iteratorEiPFbS2_S2_EEvT_S7_T0_T1_ at Base 5.0.2
  (optional=templinst|arch=ia64 powerpcspe s390 sparc)_ZSt16__introsort_loopIN5QListIP15QGraphicsObjectE8iteratorEiPFbPK13QGraphicsItemS7_EEvT_SA_T0_T1_ at Base 5.0.2
+ (optional=templinst|arch=amd64)_ZSt16__introsort_loopIP7QStringlEvT_S2_T0_ at Base 5.3.0
  (optional=templinst|arch=ia64 powerpcspe s390 sparc)_ZSt19__move_median_firstIN5QListI5QPairIPN23QFileSystemModelPrivate15QFileSystemNodeEiEE8iteratorE22QFileSystemModelSorterEvT_S9_S9_T0_ at Base 5.0.2 1
  (optional=templinst|arch=ia64 powerpcspe s390 sparc)_ZSt19__move_median_firstIN5QListIP13QGraphicsItemE8iteratorEPFbPKS1_S6_EEvT_S9_S9_T0_ at Base 5.0.2
  (optional=templinst|arch=ia64 powerpcspe s390 sparc)_ZSt19__move_median_firstIN5QListIP13QGraphicsItemE8iteratorEPFbS2_S2_EEvT_S7_S7_T0_ at Base 5.0.2

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list