[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-44-g9b996f3

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 9b996f3c6583968873fa0ca92b6f2e394cb93c45
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Aug 28 00:22:01 2014 -0300

    ACK NMu and remove patch it introduced.
    
    We no longer need it.
---
 debian/changelog                            |  5 +++++
 debian/patches/ignore-new_gcc_warnings.diff | 13 -------------
 debian/patches/series                       |  1 -
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39c9580..ba67f87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,11 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
   * Bump standards version to 3.9.5, no changes needed
   * Update copyright file.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Acknowledge previous NMU (thanks Matthias!).
+    - Remove ignore-new_gcc_warnings.diff introduced in the NMU, as the code
+      that it patches is no longer there.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Jun 2014 21:18:08 +0200
 
 qtwebkit (2.2.1-7.1) unstable; urgency=medium
diff --git a/debian/patches/ignore-new_gcc_warnings.diff b/debian/patches/ignore-new_gcc_warnings.diff
deleted file mode 100644
index 255730b..0000000
--- a/debian/patches/ignore-new_gcc_warnings.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/Source/WebKit.pri
-===================================================================
---- a/Source/WebKit.pri
-+++ b/Source/WebKit.pri
-@@ -114,7 +114,7 @@ CONFIG -= warn_on
- 
- # Treat warnings as errors on x86/Linux/GCC
- linux-g++*|glibc-*|hurd-* {
--    isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -Wno-error=unused-local-typedefs
-+    isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -Wno-error=unused-local-typedefs -Wno-error=unused-function
- 
-     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
-         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
diff --git a/debian/patches/series b/debian/patches/series
index 0966d4c..e99cc08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@ glibc_hurd_mkspecs.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
 ignore-unused-local-typedefs_error.diff
-ignore-new_gcc_warnings.diff
 gstreamer-1.0.diff
 hide_wtf_symbols.diff
 hide_jsc_symbols.diff

-- 
QtWebKit packaging