[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-4-7-g43ad870

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 43ad87041807838177f3faa7018d9de09715db5b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 29 16:44:55 2014 -0300

    Remove upstream_changeset_119798.diff, already present in this version.
---
 debian/changelog                              |  1 +
 debian/patches/series                         |  2 +-
 debian/patches/upstream_changeset_119798.diff | 12 ------------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 442bce8..6430f14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit (2.3.4.dfsg-1) UNRELEASED; urgency=medium
   * Respect the number of parralel builds specified in DEB_BUILD_OPTIONS
     (Closes: #761821).
     - Remove bound_cpu_usage.patch as this is now not needed.
+  * Remove upstream_changeset_119798.diff, already present in this version.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Sep 2014 11:20:39 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 84e05a2..7dd12cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 # upstream patches
-upstream_changeset_119798.diff
+
 # debian patches
 02_add_nostrip_for_debug_packages.diff
 03_hide_std_symbols.diff
diff --git a/debian/patches/upstream_changeset_119798.diff b/debian/patches/upstream_changeset_119798.diff
deleted file mode 100644
index 1f6cf69..0000000
--- a/debian/patches/upstream_changeset_119798.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Origin: https://bugs.webkit.org/show_bug.cgi?id=119798
-Subversion Revision: 154045
---- 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 {

-- 
QtWebKit packaging