[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.6.1-4-85-ga9edb26

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit be18a41a85bb0aa54081b00dc777283501b5c522
Merge: 99548d339e6f15115c12ad61f624164c2ce8642f 52edfe90777092392d0ec3bc775c5cd86fe500da
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 19 05:34:59 2016 +0000

    Merge branch 'master' into ubuntu+1

 debian/changelog                                   | 39 +++++++++++++-
 debian/control                                     | 10 ++--
 ...se_types_if_they_arent_referenced_anymore.patch | 63 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 107 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 492cd6f,00fe197..670ffd5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,40 +1,63 @@@
- qtdeclarative-opensource-src (5.6.0-1ubuntu1) UNRELEASED; urgency=medium
++qtdeclarative-opensource-src (5.6.1-4ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Merge with Debian.
 +  * Update symbols.
 +  * Drop backported upstream patches now included:
 +    - Add-QQuickAsyncImageProvider.patch
 +    - Add-isTabFence-private-flag.patch
 +    - Don-t-change-the-currentItem-after-a-viewport-resize.patch
 +    - Don-t-make-currentIndex-skip-an-extra-item-on-remova.patch
 +    - Fix-memory-leak-when-using-async-image-providers.patch
 +    - Flickable-avoid-perturbing-the-timeline-further-whil.patch
 +    - Image-fix-crash-when-switching-between-multiple-scre.patch
 +    - Make-sure-we-stop-animators-if-they-are-yet-to-be-st.patch
 +    - MultiPointTouchArea-Fixed-released-duplication-on-mo.patch
 +    - QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch
 +    - WIP-QQuickItem-fix-another-infinite-loop-in-nextItem.patch
 +    - qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
 +  * Refresh QML cache and test binary location patches to apply.
 +  * Modify QML cache patch to Qt 5.6 changes. (LP: #1556824)
 +  * Mark private symbols.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 26 Jan 2016 10:07:50 +0000
 +
+ qtdeclarative-opensource-src (5.6.1-5) UNRELEASED; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Update symbols files with buildds' logs (Closes: #830817).
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 13 Jul 2016 19:28:45 -0300
+ 
+ qtdeclarative-opensource-src (5.6.1-4) unstable; urgency=medium
+ 
+   * Backport qml_only_release_types_if_they_arent_referenced_anymore.patch,
+     it solves a nasty crash.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 16 Jun 2016 10:45:18 -0300
+ 
+ qtdeclarative-opensource-src (5.6.1-3) unstable; urgency=medium
+ 
+   * Update symbols files with buildd's logs so hurd can also be part of the
+     transition.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 14 Jun 2016 11:26:47 -0300
+ 
+ qtdeclarative-opensource-src (5.6.1-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 13 Jun 2016 09:51:07 -0300
+ 
+ qtdeclarative-opensource-src (5.6.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - Bump Qt build dependencies.
+   * Update symbols files with buildds' and current build log.
+   * Mark private symbols as such.
+   * Update Standards-Version to 3.9.8, no changes required.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 09 Jun 2016 18:12:03 -0300
+ 
  qtdeclarative-opensource-src (5.6.0-1) experimental; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 8dd5df9,366fc7a..c56b252
--- a/debian/control
+++ b/debian/control
@@@ -11,16 -10,14 +11,16 @@@ Uploaders: Sune Vuorela <debian at pusling
  Build-Depends: debhelper (>= 9),
                 dpkg-dev (>= 1.16.1),
                 libdouble-conversion-dev,
-                libqt5xmlpatterns5-dev (>= 5.6.0~),
+                libqt5xmlpatterns5-dev (>= 5.6.1~),
                 pkg-kde-tools (>= 0.15.17~),
                 python,
-                qtbase5-private-dev (>= 5.6.0+dfsg~),
+                qtbase5-private-dev (>= 5.6.1+dfsg~)
 +               xauth,
 +               xvfb
- Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0+dfsg~),
-                      qtbase5-doc-html (>= 5.6.0+dfsg~),
+ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.1+dfsg~),
+                      qtbase5-doc-html (>= 5.6.1+dfsg~),
 -                     qttools5-dev-tools (>= 5.6.1~)
 +                     qttools5-dev-tools (>= 5.6.0~)
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
  Homepage: http://qt-project.org/
  Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtdeclarative.git
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtdeclarative.git
diff --cc debian/patches/series
index 80d3043,5e68a6d..2a8c281
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,5 +1,7 @@@
  # Backported patches
 +QQuickItemView-forceLayout-Also-call-layout-when-d-f.patch
 +Fix-crash-in-hasAtlasTexture.patch
+ qml_only_release_types_if_they_arent_referenced_anymore.patch
  
  # Debian patches
  check_system_double-conversion.patch

-- 
qtdeclarative packaging