[SCM] qttools packaging branch, experimental, updated. debian/5.7.0-1-9-gfe3b1e1

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Sun Oct 16 22:22:00 UTC 2016


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

The following commit has been merged in the experimental branch:
commit fe3b1e14ac14fd3af63fca2f22bfc92b66c7a721
Merge: 53ee2639d60109ce7c7887adf15142ec6c878672 e191279b3fc14ea7074be1e099fcd6179c3eddf8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Oct 16 19:21:33 2016 -0300

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/control
    	debian/libqt5designer5.symbols
    	debian/libqt5designercomponents5.symbols
    
    d/control merged by hand, symbols kept as in 5.7.0.

 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 0f92c13,14e15ec..34bce26
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,10 +1,38 @@@
 +qttools-opensource-src (5.7.0-2) UNRELEASED; urgency=medium
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Mark qttools5-dev-tools as M-A: same. The package is coinstallable and
 +    files shipped in /usr/share/qt5/ are really architecture-independent.
 +  * Make qttools5-dev depend upon qttools5-dev-tools (Closes: #835295).
 +    qtttools5-dev ships CMake files that both set variables for building
 +    against the libs shipped in it and to use some of the tools shipped by
 +    qttools5-dev-tools. If at some later point we need to break this
 +    relationship the easiest way would be to split qttools5-dev-tools
 +    into the necessary parts.
 +    Thanks Harald Sitter for the bug report and the patch.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Aug 2016 11:54:10 -0300
 +
 +qttools-opensource-src (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Bump Qt build-dependencies to 5.7.0.
 +  * Install upstream manpages for lrelease and lupdate.
 +  * Update debian/copyright.
 +  * Drop lrelease-zlib.patch. We do not link with libQt5Bootstrap.a, and the
 +    build succeeds without it.
 +  * Update symbols files from amd64 build log.
 +  * Drop libdouble-conversion-dev build-dependency (closes: #802153).
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 08 Jul 2016 13:32:04 +0300
 +
+ qttools-opensource-src (5.6.1-3) unstable; urgency=medium
+ 
+   * Do not build with webkit support on m68k and sh4 (Closes: #840693).
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 16 Oct 2016 19:18:17 -0300
+ 
  qttools-opensource-src (5.6.1-2) unstable; urgency=medium
  
    * Upload to unstable.
diff --cc debian/control
index 4794fa2,4605bea..98f1a7f
--- a/debian/control
+++ b/debian/control
@@@ -9,14 -9,15 +9,14 @@@ Uploaders: Sune Vuorela <debian at pusling
             Timo Jyrinki <timo at debian.org>,
             Dmitry Shachnev <mitya57 at debian.org>
  Build-Depends: debhelper (>= 9),
 -               libdouble-conversion-dev,
 -               libqt5opengl5-dev (>= 5.6.1+dfsg~),
 -               libqt5sql5-sqlite (>= 5.6.1+dfsg~),
 -               libqt5webkit5-dev (>= 5.6.1+dfsg~) [!m68k !sh4],
 +               libqt5opengl5-dev (>= 5.7.0+dfsg~),
 +               libqt5sql5-sqlite (>= 5.7.0+dfsg~),
-                libqt5webkit5-dev (>= 5.7.0+dfsg~),
++               libqt5webkit5-dev (>= 5.7.0+dfsg~) [!m68k !sh4],
                 pkg-kde-tools,
 -               qtbase5-private-dev (>= 5.6.1+dfsg~),
 -               qtdeclarative5-private-dev (>= 5.6.1~),
 +               qtbase5-private-dev (>= 5.7.0+dfsg~),
 +               qtdeclarative5-private-dev (>= 5.7.0~),
                 zlib1g-dev
 -Build-Depends-Indep: qtbase5-doc-html (>= 5.6.1+dfsg~)
 +Build-Depends-Indep: qtbase5-doc-html (>= 5.7.0+dfsg~)
  Standards-Version: 3.9.8
  Homepage: http://qt-project.org/
  Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qttools.git

-- 
qttools packaging



More information about the pkg-kde-commits mailing list