[SCM] qt5webkit packaging branch, master, updated. debian/5.2.0+dfsg-2-9-gf339047

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit f3390472b8042847f23fa4d3af2fa375eac2f93a
Merge: 84c41b77da9f6eb7658e11bb725401c017d7986b 8264d99b9383c679518d1a41038c6a1e265bad47
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 31 21:40:05 2014 -0300

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/patches/series

 debian/changelog                   |  8 ++++++++
 debian/patches/glslang_bison3.diff | 14 ++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 23 insertions(+)

diff --cc debian/changelog
index 9d1509f,d3f8f34..5d235c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,11 +1,43 @@@
 +qtwebkit-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=medium
 +
 +  [ Dmitry Shachnev ]
 +  * Add a patch (disable_jit_llint.diff) to disable JIT and llint on ia64, s390
 +    and sparc.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Jan 2014 22:35:45 +0400
 +
 +qtwebkit-opensource-src (5.2.0+dfsg-2) experimental; urgency=medium
 +
 +  * Update symbols files with buildd's logs.
 +  * Workaround FTBFS in 64 bits big endian archs.
 +    See https://bugs.webkit.org/show_bug.cgi?id=113638
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Fri, 20 Dec 2013 08:57:57 -0300
 +
 +qtwebkit-opensource-src (5.2.0+dfsg-1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * Bump Qt build dependencies.
 +  * Refresh 05_sparc_unaligned_access.diff, no_gc_sections.diff and hurd.diff.
 +  * Remove new private stuff we are not shipping.
 +  * Update symbols files.
 +  * Remove jsmin.py from the original tarball because it is not
 +    DFSG-compatible.
 +    - Create a dfsg version.
 +    - Add a rule to prune non-free stuff in debian/rules.
 +    - Mangle the dfsg version in debian/watch.
 +  * Fix wrong name and path of the GPL-2 license in debian/copyright.
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 18 Dec 2013 20:56:37 -0300
 +
+ qtwebkit-opensource-src (5.1.1-2) unstable; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Backport upstream patch (glslang_bison3.diff) to fix build failure
+     with bison 3 (closes: #731979).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 22 Dec 2013 16:35:23 -0300
+ 
  qtwebkit-opensource-src (5.1.1-1) unstable; urgency=low
  
    * New upstream release.
diff --cc debian/patches/series
index 7b42e59,d58b441..d050e4b
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -4,4 -4,4 +4,5 @@@ stabs_format_debug_info.dif
  no_gc_sections.diff
  hurd.diff
  webkit_qt_hide_symbols.diff
 +disable_jit_llint.diff
+ glslang_bison3.diff

-- 
qt5webkit packaging