[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.7.1-1-133-gc38f228

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit b3dbce964be5466e225095ffbc887d1805371f71
Merge: 6c130c74deb9ddbd03b6f2051e5fcbe17bb1e554 d83d212d83d96a910267e11e764f3bcf12b3d1ab
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 2 05:54:49 2017 +0000

    Merge branch 'master' into ubuntu+1

 debian/changelog                    |  21 +-
 debian/control                      |  28 +--
 debian/patches/fix_tags_types.diff  | 184 ----------------
 debian/patches/revert_c9ffed92.diff | 421 ------------------------------------
 debian/patches/series               |   2 -
 5 files changed, 22 insertions(+), 634 deletions(-)

diff --cc debian/changelog
index 710f785,baa2f89..71dd459
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,22 +1,39 @@@
- qtdeclarative-opensource-src (5.7.1~20161021-5ubuntu1) UNRELEASED; urgency=medium
++qtdeclarative-opensource-src (5.7.1-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Dmitry Shachnev ]
 +  * Merge 5.6.1-7 from unstable.
 +
 +  [ Timo Jyrinki ]
 +  * New upstream release.
 +  * Drop patches now in upstream.
 +  * Rebase patches to apply to 5.7:
 +    - debian/patches/Fix-visibility-of-properties-in-value-types.patch
 +    - debian/patches/disable_failing_tests.patch
 +    - debian/patches/fix_binary_location_for_tests.patch
 +  * Rebase QML cache patch for 5.7 and add arm64 support.
 +  * Update symbols and mark private ones for 5.7.0 and 5.7.1.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 07 Sep 2016 13:12:08 +0000
 +
+ qtdeclarative-opensource-src (5.7.1-2) UNRELEASED; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Drop obsolete Breaks/Replaces. Qt versions before 5.3.2 were never part
+     of a stable release (Jessie and Wheezy-backports have 5.3.2).
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 Dec 2016 00:52:28 +0300
+ 
+ qtdeclarative-opensource-src (5.7.1-1) unstable; urgency=medium
+ 
+   * New upstream final release.
+   * Drop revert_c9ffed92.diff, the issue has been properly fixed upstream.
+   * Drop fix_tags_types.diff, applied upstream.
+   * Bump qtbase build-dependencies to 5.7.1 final.
+   * Update symbols files from buildds’ logs and the current build log.
+   * Replace 5.7.1~20161021 with 5.7.1 in the symbols files.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 14 Dec 2016 22:58:14 +0300
+ 
  qtdeclarative-opensource-src (5.7.1~20161021-5) unstable; urgency=medium
  
    * Revert upstream commit c9ffed92a0dee0ae, which broke Qt Quick Controls.
diff --cc debian/control
index 1053862,25336fc..aa0c949
--- a/debian/control
+++ b/debian/control
@@@ -238,9 -173,7 +228,7 @@@ Package: qml-module-qtquick
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
 -Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends}
 +Depends: libgl1-mesa-dri | libgl1, ${misc:Depends}, ${shlibs:Depends}
- Breaks: qtdeclarative5-qtquick2-plugin (<< 5.2.1-5~)
- Replaces: qtdeclarative5-qtquick2-plugin (<< 5.2.1-5~)
  Description: Qt 5 Qt Quick 2 QML module
   Qt is a cross-platform C++ application framework. Qt's primary feature
   is its rich set of widgets that provide standard GUI functionality.
diff --cc debian/patches/series
index ce64a82,a8d53d1..390631f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,6 +1,11 @@@
  # Backported patches
 +Fix-visibility-of-properties-in-value-types.patch
  fix_tst_qqmlapplicationengine.diff
- fix_tags_types.diff
  
  # Debian patches
  disableopengltests.patch
  fix_test_remove_qlibraryinfo.patch
- revert_c9ffed92.diff
 +
 +# Ubuntu patches
 +QML-Compilation-unit-caching-and-JIT-changes.patch
 +skip_failing_i386_test.patch

-- 
qtdeclarative packaging