[SCM] qt5webkit packaging branch, ubuntu, updated. debian/5.6.0+dfsg-1-11-gf41bc45

Timo Jyrinki timo at moszumanska.debian.org
Thu Apr 7 14:04:31 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit 502678a922320526d96becfcf10058c7994ce1c0
Merge: df1379cc4f8b381f8bc2fd0bf363f7fbc4ffd94b d52c47f87f54fa4e29e277fd39c869d6dd4c0a05
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 21 11:51:55 2016 +0000

    Merge branch 'experimental' into ubuntu

 debian/changelog                | 14 +++++++++++---
 debian/control                  | 14 +++++++-------
 debian/rules                    |  6 +++++-
 debian/source/lintian-overrides | 24 ++++++++----------------
 debian/watch                    |  4 ++--
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --cc debian/changelog
index ae6ccf0,25ded83..77c5c65
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,14 +1,22 @@@
 +qtwebkit-opensource-src (5.6.0~rc+dfsg-3ubuntu1) UNRELEASED; urgency=medium
 +
-   [ Dmitry Shachnev ]
-   * Make sure the Makefile needed for building docs is generated.
- 
 +  [ Timo Jyrinki ]
 +  * New upstream release.
 +  * Drop transitional package after 16.04 LTS is released.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 08 Mar 2016 09:35:31 +0000
 +
+ qtwebkit-opensource-src (5.6.0+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Make sure the Makefile needed for building docs is generated.
+   * Update debian/watch for new tarballs location.
+   * Bump Qt build-dependencies to 5.6.0.
+   * Do not hardcode version number in debian/rules.
+   * Update Lintian overrides for JS files with long lines.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 20 Mar 2016 21:39:26 +0100
+ 
  qtwebkit-opensource-src (5.6.0~rc+dfsg-2) experimental; urgency=medium
  
    * Explicitly specify Makefile for building docs.
diff --cc debian/control
index cb9d712,9583207..d61e44b
--- a/debian/control
+++ b/debian/control
@@@ -21,9 -20,10 +21,9 @@@ Build-Depends: bison
                 libjpeg-dev,
  #              libleveldb-dev,
                 libpng-dev,
-                libqt5opengl5-dev (>= 5.6.0~rc+dfsg~),
-                libqt5xmlpatterns5-dev (>= 5.6.0~rc~),
+                libqt5opengl5-dev (>= 5.6.0+dfsg~),
+                libqt5xmlpatterns5-dev (>= 5.6.0~),
                 libsqlite3-dev,
 -               libwebp-dev,
                 libxcomposite-dev,
                 libxml2-dev,
                 libxrender-dev,

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list