[SCM] qt5webkit packaging branch, ubuntu, updated. debian/5.6.1+dfsg-4-13-g1fc9295

Timo Jyrinki timo at moszumanska.debian.org
Tue Jul 26 12:07:04 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit 1fc92951ef97047bfb34a43992aa366ed46e414d
Merge: 302771d6de12f648ee80b247c8f9c581431700c6 63684fd1ec87a4862bd9a9d291bfa8328642c576
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 19 10:00:14 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                        | 30 +++++++++++++++++++++++++++++-
 debian/control                          | 18 +++++++++---------
 debian/libqt5webkit5.symbols            | 20 +++++++++++---------
 debian/patches/fix_pthread_linking.diff | 12 ++++++++----
 4 files changed, 57 insertions(+), 23 deletions(-)

diff --cc debian/changelog
index 16f5406,1c33dee..bf28d8f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,31 +1,42 @@@
- qtwebkit-opensource-src (5.6.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
++qtwebkit-opensource-src (5.6.1+dfsg-4ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Drop transitional package after 16.04 LTS is released.
 +  * Sync with Debian packaging, remaining changes:
 +    - Build without WebP (in universe)
 +    - Own .symbols file
 +  * Update symbols from s390x build log.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 08 Mar 2016 09:35:31 +0000
 +
+ qtwebkit-opensource-src (5.6.1+dfsg-4) unstable; urgency=medium
+ 
+   * Update symbols files with buildd's logs (Closes: 827783).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 23 Jun 2016 00:02:14 -0300
+ 
+ qtwebkit-opensource-src (5.6.1+dfsg-3) unstable; urgency=medium
+ 
+   * Update symbols files with buildds' logs.
+   * Upload to unstable.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 13 Jun 2016 10:12:19 -0300
+ 
+ qtwebkit-opensource-src (5.6.1+dfsg-2) experimental; urgency=medium
+ 
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 12 Jun 2016 20:33:02 -0300
+ 
+ qtwebkit-opensource-src (5.6.1+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - Bump Qt build dependencies.
+   * Refresh fix_pthread_linking.diff.
+   * Update Standards-Version to 3.9.8, no changes required.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Fri, 10 Jun 2016 15:12:20 -0300
+ 
  qtwebkit-opensource-src (5.6.0+dfsg-1) experimental; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index d61e44b,7fc5311..dab7289
--- a/debian/control
+++ b/debian/control
@@@ -21,9 -20,10 +21,9 @@@ Build-Depends: bison
                 libjpeg-dev,
  #              libleveldb-dev,
                 libpng-dev,
-                libqt5opengl5-dev (>= 5.6.0+dfsg~),
-                libqt5xmlpatterns5-dev (>= 5.6.0~),
+                libqt5opengl5-dev (>= 5.6.1+dfsg~),
+                libqt5xmlpatterns5-dev (>= 5.6.1~),
                 libsqlite3-dev,
 -               libwebp-dev,
                 libxcomposite-dev,
                 libxml2-dev,
                 libxrender-dev,
diff --cc debian/libqt5webkit5.symbols
index 00f082c,f8abd59..7ebbac8
--- a/debian/libqt5webkit5.symbols
+++ b/debian/libqt5webkit5.symbols
@@@ -3016,17 -3016,19 +3016,19 @@@ libQt5WebKit.so.5 libqt5webkit5 #MINVER
   (optional=templinst)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE24_M_get_insert_unique_posERS2_ at Base 5.0.2
   (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_ at Base 5.2.0
   (optional=templinst)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E at Base 5.0.2
-  (optional=gccinternal)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE22_M_emplace_hint_uniqueIIRKSt21piecewise_construct_tSt5tupleIIOS5_EESK_IIEEEEESt17_Rb_tree_iteratorIS9_ESt23_Rb_tree_const_iteratorIS9_EDpOT_ at Base 5.4.2
-  (optional=gccinternal)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESK_IJEEEEESt17_Rb_tree_iteratorIS9_ESt23_Rb_tree_const_iteratorIS9_EDpOT_ at Base 5.4.2
-  (optional=gccinternal)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE24_M_get_insert_unique_posERS7_ at Base 5.4.2
-  (optional=gccinternal)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E at Base 5.4.2
-  (optional=gccinternal)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIIRKSt21piecewise_construct_tSt5tupleIIOS5_EESJ_IIEEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_ at Base 5.4.2
-  (optional=gccinternal)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESJ_IJEEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_ at Base 5.4.2
-  (optional=gccinternal)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_ at Base 5.4.2
-  (optional=gccinternal)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E at Base 5.4.2
+  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE22_M_emplace_hint_uniqueIIRKSt21piecewise_construct_tSt5tupleIIOS5_EESK_IIEEEEESt17_Rb_tree_iteratorIS9_ESt23_Rb_tree_const_iteratorIS9_EDpOT_ at Base 5.4.2
+  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESK_IJEEEEESt17_Rb_tree_iteratorIS9_ESt23_Rb_tree_const_iteratorIS9_EDpOT_ at Base 5.4.2
+  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE24_M_get_insert_unique_posERS7_ at Base 5.4.2
+  (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_ at Base 5.4.2
+  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E at Base 5.4.2
+  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIIRKSt21piecewise_construct_tSt5tupleIIOS5_EESJ_IIEEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_ at Base 5.4.2
+  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESJ_IJEEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_ at Base 5.4.2
+  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_ at Base 5.4.2
+  (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_ at Base 5.4.2
+  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E at Base 5.4.2
   (optional=templinst|subst)_ZNSt8_Rb_treeISt4pairIi{uint64_t}ES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIS1_EES0_ISt17_Rb_tree_iteratorIS1_EbEOT_ at Base 5.4.1
   (optional=templinst|subst)_ZNSt8_Rb_treeISt4pairIi{uint64_t}ES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E at Base 5.4.1
 - (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE7_M_copyINS5_11_Alloc_nodeEEEPSt13_Rb_tree_nodeImEPKS9_SA_RT_ at Base 5.4.2
 + (optional=gccinternal)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE7_M_copyINS5_11_Alloc_nodeEEEPSt13_Rb_tree_nodeImEPKS9_SA_RT_ at Base 5.4.2
   (optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE16_M_insert_uniqueIRK{uint64_t}EESt4pairISt17_Rb_tree_iteratorI{uint64_t}EbEOT_ at Base 5.3.0
   (optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE5eraseERK{uint64_t}@Base 5.3.0
   (optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE8_M_eraseEPSt13_Rb_tree_nodeI{uint64_t}E at Base 5.3.0

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list