[SCM] qtdeclarative packaging branch, ubuntu, updated. debian/5.5.1-2-33-g15a27b9

Timo Jyrinki timo at moszumanska.debian.org
Sun Oct 18 09:10:04 UTC 2015


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

The following commit has been merged in the ubuntu branch:
commit 15a27b916f641badc9ac01b0a58a3a6b1f9a4a0f
Merge: 98b022179858ef6d342774a65ea5b8a605813b94 cabff67e7b186c23e9ab605af4672eaae35e947f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Sun Oct 18 09:09:56 2015 +0000

    Merge branch 'experimental' into ubuntu

 debian/changelog                | 20 +++++++++++++++++++-
 debian/control                  |  4 ++--
 debian/libqt5qml5.symbols       | 13 +++++++------
 debian/libqt5quick5.symbols     |  6 +++---
 debian/rules                    |  3 +++
 debian/source/lintian-overrides |  4 ++++
 6 files changed, 38 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 0fa98d3,c5c1772..25a4377
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,21 +1,44 @@@
- qtdeclarative-opensource-src (5.5.0-2ubuntu1) UNRELEASED; urgency=medium
++qtdeclarative-opensource-src (5.5.1-2ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Remove patches no longer needed:
 +    - debian/patches/High-dpi-SVG-and-QQuickImageProvider-Images.patch
 +    - debian/patches/aarch64.patch
 +    - debian/patches/check_system_double-conversion.patch
 +    - debian/patches/ppc64el.patch
 +  * Rebase patches:
 +    - debian/patches/Add-QQuickAsyncImageProvider.patch
 +    - debian/patches/disable_failing_tests.patch
 +    - debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
 +      (LP: #1437320)
 +  * Update .install files.
 +  * Skip tests also on ppc64el, they are flaky.
 +  * Update symbols and mark/unmark private ones.
 +  * Bump ABI version to 5-5-0.
 +  * Bump build dependencies.
 +  * Build dep on libqt5xcbqpa5 to be able to run the tests under xvfb.
 +  * Update Vcs url:s to Debian git.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 09 Jul 2015 11:02:34 +0000
 +
+ qtdeclarative-opensource-src (5.5.1-2) experimental; urgency=medium
+ 
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sat, 17 Oct 2015 09:14:01 -0300
+ 
+ qtdeclarative-opensource-src (5.5.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - Bump Qt build dependencies.
+   * Update symbols files with buildds' logs.
+   * Update symbols files with current build log.
+   * Do not ship empty directories.
+   * Add two lintian overrides for examples/quick/canvas/tiger/tiger.js. It is
+     not a minified javascript and is the preferred source of modification.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Fri, 16 Oct 2015 16:04:03 -0300
+ 
  qtdeclarative-opensource-src (5.5.0-2) experimental; urgency=medium
  
    * Update symbols files with buildds’ logs.
diff --cc debian/control
index 9c34542,a7bc31e..b01ba9d
--- a/debian/control
+++ b/debian/control
@@@ -11,12 -10,10 +11,12 @@@ Uploaders: Sune Vuorela <debian at pusling
  Build-Depends: debhelper (>= 9),
                 dpkg-dev (>= 1.16.1),
                 libdouble-conversion-dev,
-                libqt5xmlpatterns5-private-dev (>= 5.5.0~),
+                libqt5xmlpatterns5-private-dev (>= 5.5.1~),
                 pkg-kde-tools (>= 0.15.17~),
                 python,
-                qtbase5-private-dev (>= 5.5.0+dfsg~),
 -               qtbase5-private-dev (>= 5.5.1+dfsg~)
++               qtbase5-private-dev (>= 5.5.1+dfsg~),
 +               xauth,
 +               xvfb
  Standards-Version: 3.9.6
  Homepage: http://qt-project.org/
  Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
diff --cc debian/libqt5quick5.symbols
index 5e96d48,656fc06..824d538
--- a/debian/libqt5quick5.symbols
+++ b/debian/libqt5quick5.symbols
@@@ -1,8 -1,8 +1,8 @@@
- # SymbolsHelper-Confirmed: 5.5.0 amd64 arm64 armhf i386 powerpc ppc64el
+ # SymbolsHelper-Confirmed: 5.5.1 amd64 i386
 -libQt5Quick.so.5 libqt5quick5 #MINVER#
 -| libqt5quick5 #MINVER#, qtdeclarative-abi-5-5-0
 +libQt5Quick.so.5 libqt5quick5 #MINVER# | libqt5quick5-gles #MINVER#
 +| libqt5quick5 #MINVER# | libqt5quick5-gles #MINVER#, qtdeclarative-abi-5-5-0
   _Z23qsgnode_set_descriptionP7QSGNodeRK7QString at Base 5.4.0
 - (optional=gccinternal)_ZN10QByteArray7reserveEi at Base 5.4.2
 + (optional=gccinternal)_ZN10QByteArray7reserveEi at Base 5.3.0
   _ZN10QQuickItem10classBeginEv at Base 5.0.2
   _ZN10QQuickItem10itemChangeENS_10ItemChangeERKNS_14ItemChangeDataE at Base 5.0.2
   _ZN10QQuickItem10resetWidthEv at Base 5.0.2
@@@ -1086,7 -1085,7 +1085,7 @@@
   _ZN15QSGPlainTextureD0Ev at Base 5.0.2 1
   _ZN15QSGPlainTextureD1Ev at Base 5.0.2 1
   _ZN15QSGPlainTextureD2Ev at Base 5.0.2 1
-  _ZN16QCoreApplication9sendEventEP7QObjectP6QEvent at Base 5.5.0
 - (optional=internal|arch=amd64)_ZN16QCoreApplication9sendEventEP7QObjectP6QEvent at Base 5.3.2
++ (optional=internal|arch=amd64)_ZN16QCoreApplication9sendEventEP7QObjectP6QEvent at Base 5.5.0
   _ZN16QQuickCloseEvent11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.1.0 1
   _ZN16QQuickCloseEvent11qt_metacastEPKc at Base 5.1.0 1
   _ZN16QQuickCloseEvent16staticMetaObjectE at Base 5.1.0 1

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list