[SCM] qt5webkit packaging branch, ubuntu, updated. debian/5.6.0-rc+dfsg-2-11-gdf1379c

Timo Jyrinki timo at moszumanska.debian.org
Mon Mar 21 11:50:47 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit f3773385831360cd4024595da25cccf21b21aa74
Merge: e3b4896bc9887ad9b7f282784050676c305ad913 a7532123f05f0120059ebd91411eac8659709d61
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Mar 8 09:36:43 2016 +0000

    Merge branch 'experimental' into ubuntu

 debian/changelog                        |  30 ++
 debian/control                          |  31 +-
 debian/libqt5webkit5.symbols            | 833 ++++++++++++++++----------------
 debian/patches/fix_pthread_linking.diff |  14 +
 debian/patches/series                   |   1 +
 debian/rules                            |   8 +-
 6 files changed, 501 insertions(+), 416 deletions(-)

diff --cc debian/changelog
index 6583879,863645a..6c4739c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,30 +1,43 @@@
 -qtwebkit-opensource-src (5.6.0~rc+dfsg-3) UNRELEASED; urgency=medium
++qtwebkit-opensource-src (5.6.0~rc+dfsg-3ubuntu1) UNRELEASED; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Make sure the Makefile needed for building docs is generated.
+ 
 - -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 07 Mar 2016 22:31:23 +0300
++  [ Timo Jyrinki ]
++  * New upstream release.
++
++ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 08 Mar 2016 09:35:31 +0000
+ 
+ qtwebkit-opensource-src (5.6.0~rc+dfsg-2) experimental; urgency=medium
+ 
+   * Explicitly specify Makefile for building docs.
+   * Backport fix_pthread_linking.diff from upstream.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 06 Mar 2016 22:36:47 +0300
+ 
+ qtwebkit-opensource-src (5.6.0~rc+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Bump Qt build-dependencies to 5.6.0~rc.
+   * Add back qtwebkit5-doc package.
+   * Use recommended https URIs for Vcs fields.
+   * Do not build-depend on qtxmlpatterns private headers.
+   * Update symbols files from the current build log.
+   * Call syncqt.pl in configure target.
+   * Bump Standards-Version to 3.9.7, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 06 Mar 2016 13:12:22 +0300
+ 
 +qtwebkit-opensource-src (5.5.1+dfsg-2ubuntu1) xenial; urgency=medium
 +
 +  * New upstream release.
 +  * Sync with Debian packaging, remaining changes:
 +    - Build without WebP (in universe)
 +    - Transitional package for 14.04 LTS -> 16.04 LTS
 +    - Own .symbols file
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 30 Nov 2015 09:27:17 +0000
 +
  qtwebkit-opensource-src (5.5.1+dfsg-2) unstable; urgency=medium
  
    * Upload to unstable.
diff --cc debian/control
index 5ac2fb6,c3051f8..5fb8818
--- a/debian/control
+++ b/debian/control
@@@ -21,9 -20,10 +21,9 @@@ Build-Depends: bison
                 libjpeg-dev,
  #              libleveldb-dev,
                 libpng-dev,
-                libqt5opengl5-dev (>= 5.5.1+dfsg~),
-                libqt5xmlpatterns5-private-dev (>= 5.5.1~),
+                libqt5opengl5-dev (>= 5.6.0~rc+dfsg~),
+                libqt5xmlpatterns5-dev (>= 5.6.0~rc~),
                 libsqlite3-dev,
 -               libwebp-dev,
                 libxcomposite-dev,
                 libxml2-dev,
                 libxrender-dev,

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list