[SCM] qtdeclarative packaging branch, ubuntu, updated. ubuntu/5.5.1-2ubuntu4-9-g02bd660

Timo Jyrinki timo at moszumanska.debian.org
Mon Mar 14 13:11:19 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit 0ac6e993091ccd9a148c2dde55154a73a8b07988
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 14 13:09:28 2016 +0000

    Also remove from series file.
---
 debian/changelog          | 4 ----
 debian/libqt5qml5.symbols | 4 ++--
 debian/patches/series     | 2 --
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37ed21c..1071715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
 qtdeclarative-opensource-src (5.5.1-2ubuntu5) UNRELEASED; urgency=medium
 
-  * debian/patches/Don-t-check-for-revisions-when-assigning-to-grouped-.patch:
-    - Fix versioning (LP: #1389721)
-  * debian/patches/qml-preserve-composite-singleton-types.patch:
-    - Fix broken qml type description files: (LP: #1541346)
   * Update symbols from build logs.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 01 Feb 2016 14:39:12 +0000
diff --git a/debian/libqt5qml5.symbols b/debian/libqt5qml5.symbols
index 176548f..8cd14ec 100644
--- a/debian/libqt5qml5.symbols
+++ b/debian/libqt5qml5.symbols
@@ -1898,8 +1898,8 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
  _ZN3QV49WeakValueD1Ev at Base 5.2.0~beta1 1
  _ZN3QV49WeakValueD2Ev at Base 5.2.0~beta1 1
  _ZN3QV49WeakValueaSERKS0_ at Base 5.2.0~beta1 1
- _ZN5QmlIR16PropertyResolver6signalERK7QStringPb at Base 5.5.1 1
- _ZN5QmlIR16PropertyResolver8propertyERK7QStringPbNS0_13RevisionCheckE at Base 5.5.1 1
+ _ZN5QmlIR16PropertyResolver6signalERK7QStringPbP7QObjectP15QQmlContextData at Base 5.3.0 1
+ _ZN5QmlIR16PropertyResolver8propertyERK7QStringPbP7QObjectP15QQmlContextData at Base 5.3.0 1
  _ZN5QmlIR16QmlUnitGenerator8generateERNS_8DocumentE at Base 5.3.0
  _ZN5QmlIR25ScriptDirectivesCollector10importFileERK7QStringS3_ii at Base 5.5.0
  _ZN5QmlIR25ScriptDirectivesCollector12importModuleERK7QStringS3_S3_ii at Base 5.5.0
diff --git a/debian/patches/series b/debian/patches/series
index 277d258..806ff0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,8 +11,6 @@ MultiPointTouchArea-Fixed-released-duplication-on-mo.patch
 Add-isTabFence-private-flag.patch
 QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch
 QQuickItem-fix-another-infinite-loop-in-nextItemInFo.patch
-Don-t-check-for-revisions-when-assigning-to-grouped-.patch
-qml-preserve-composite-singleton-types.patch
 
 # Debian patches
 check_system_double-conversion.patch

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list