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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 1d4780ade91902b988eb760b85d99d765d52e866
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 31 21:47:07 2014 -0300

    Remove glslang_bison3.diff, applied upstream.
---
 debian/changelog                   |  3 +++
 debian/patches/glslang_bison3.diff | 14 --------------
 debian/patches/series              |  1 -
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d235c7..4cf6fd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtwebkit-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=medium
   * Add a patch (disable_jit_llint.diff) to disable JIT and llint on ia64, s390
     and sparc.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Remove glslang_bison3.diff, applied upstream.
+
  -- 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
diff --git a/debian/patches/glslang_bison3.diff b/debian/patches/glslang_bison3.diff
deleted file mode 100644
index 3a0712d..0000000
--- a/debian/patches/glslang_bison3.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: fix build failure with new bison
-Origin: upstream, https://qt.gitorious.org/qt/qtwebkit/commit/60ba8bd5b3575d
-Last-Update: 2013-12-22
-
---- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,6 +47,7 @@
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
- 
- %union {
-     struct {
diff --git a/debian/patches/series b/debian/patches/series
index d050e4b..7b42e59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
 disable_jit_llint.diff
-glslang_bison3.diff

-- 
qt5webkit packaging