[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.6.0-1-57-gd46edcf

Timo Jyrinki timo at moszumanska.debian.org
Mon Mar 21 11:49:56 UTC 2016


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

The following commit has been merged in the ubuntu+1 branch:
commit d46edcf514258369bcd6dd4df82998b14554512b
Merge: bcad5c2f53f10a09e19993aa9f9f256c82b120da 4d35cc10f6d9f33659fba113852852f28a19fd96
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 21 11:48:48 2016 +0000

    Merge branch 'experimental' into ubuntu+1

 debian/changelog                | 15 ++++++++++++++-
 debian/control                  |  8 ++++----
 debian/rules                    |  7 -------
 debian/source/lintian-overrides | 19 +++++++++++++++----
 debian/watch                    |  4 +---
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --cc debian/changelog
index c5be3de,0f411c5..cc80c5e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,16 +1,38 @@@
- qtdeclarative-opensource-src (5.6.0~rc-1ubuntu1) UNRELEASED; urgency=medium
++qtdeclarative-opensource-src (5.6.0-1ubuntu1) 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)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 26 Jan 2016 10:07:50 +0000
 +
+ qtdeclarative-opensource-src (5.6.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop the no longer needed hack to fix wrong path in pkgconfig files.
+   * No longer need to remove empty directories, qdoc 5.6 does not create them.
+   * Revert debian/watch to track final releases again.
+   * Update symbols files from buildds’ logs.
+   * Bump Qt build-dependencies to 5.6.0.
+   * Update debian/source/lintian-overrides to include more JavaScript files
+     which Lintian wrongly considers sourceless and prebuilt.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 18 Mar 2016 17:04:55 +0100
+ 
  qtdeclarative-opensource-src (5.6.0~rc-1) experimental; urgency=medium
  
    [ Dmitry Shachnev ]
diff --cc debian/control
index 576c68d,fb8ed69..8dd5df9
--- a/debian/control
+++ b/debian/control
@@@ -11,14 -10,12 +11,14 @@@ Uploaders: Sune Vuorela <debian at pusling
  Build-Depends: debhelper (>= 9),
                 dpkg-dev (>= 1.16.1),
                 libdouble-conversion-dev,
-                libqt5xmlpatterns5-dev (>= 5.6.0~rc~),
+                libqt5xmlpatterns5-dev (>= 5.6.0~),
                 pkg-kde-tools (>= 0.15.17~),
                 python,
-                qtbase5-private-dev (>= 5.6.0~rc+dfsg~),
 -               qtbase5-private-dev (>= 5.6.0+dfsg~)
++               qtbase5-private-dev (>= 5.6.0+dfsg~),
 +               xauth,
 +               xvfb
- Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~rc+dfsg~),
-                      qtbase5-doc-html (>= 5.6.0~rc+dfsg~),
+ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0+dfsg~),
+                      qtbase5-doc-html (>= 5.6.0+dfsg~),
                       qttools5-dev-tools (>= 5.6.0~)
  Standards-Version: 3.9.7
  Homepage: http://qt-project.org/

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list