[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.0-2-9-g0cde7de

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit fba247460789f69580e09cadd0a9667e219db931
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Dec 29 17:16:35 2011 +0200

    Refresh patches - no changes needed.
---
 debian/patches/01_lflags_as-needed.diff            |    2 +-
 .../patches/02_add_nostrip_for_debug_packages.diff |    2 +-
 debian/patches/03_hide_std_symbols.diff            |    2 +-
 debian/patches/glibc_mkspec.diff                   |    2 +-
 debian/patches/stabs_format_debug_info.diff        |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/01_lflags_as-needed.diff b/debian/patches/01_lflags_as-needed.diff
index 4fb615d..48efeda 100644
--- a/debian/patches/01_lflags_as-needed.diff
+++ b/debian/patches/01_lflags_as-needed.diff
@@ -7,7 +7,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -91,6 +91,8 @@ win32-g++* {
+@@ -100,6 +100,8 @@ win32-g++* {
  CONFIG -= warn_on
  *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  
diff --git a/debian/patches/02_add_nostrip_for_debug_packages.diff b/debian/patches/02_add_nostrip_for_debug_packages.diff
index 87ad141..5a619f8 100644
--- a/debian/patches/02_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/02_add_nostrip_for_debug_packages.diff
@@ -8,7 +8,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -27,6 +27,8 @@ CONFIG(standalone_package): DEFINES *= N
+@@ -36,6 +36,8 @@ CONFIG(standalone_package): DEFINES *= N
  CONFIG += depend_includepath
  DEPENDPATH += $$OUT_PWD
  
diff --git a/debian/patches/03_hide_std_symbols.diff b/debian/patches/03_hide_std_symbols.diff
index 402598a..e5c3d31 100644
--- a/debian/patches/03_hide_std_symbols.diff
+++ b/debian/patches/03_hide_std_symbols.diff
@@ -9,7 +9,7 @@ Author: Sune Vuorela <sune at debian.org>
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -94,6 +94,7 @@ CONFIG -= warn_on
+@@ -103,6 +103,7 @@ CONFIG -= warn_on
  *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
  
  *-g++*:QMAKE_LFLAGS += -Wl,--as-needed
diff --git a/debian/patches/glibc_mkspec.diff b/debian/patches/glibc_mkspec.diff
index 99697e0..f75b02c 100644
--- a/debian/patches/glibc_mkspec.diff
+++ b/debian/patches/glibc_mkspec.diff
@@ -26,7 +26,7 @@ Forwarded: not-needed
          PKGCONFIG += glib-2.0 gio-2.0
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -104,7 +104,7 @@ CONFIG -= warn_on
+@@ -113,7 +113,7 @@ CONFIG -= warn_on
  *-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter
  
  # Treat warnings as errors on x86/Linux/GCC
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index aa87b74..ea15ad0 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -11,7 +11,7 @@ Bug-Debian: http://bugs.debian.org/618325
 
 --- a/Source/WebKit.pri
 +++ b/Source/WebKit.pri
-@@ -71,6 +71,13 @@ CONFIG(release, debug|release) {
+@@ -80,6 +80,13 @@ CONFIG(release, debug|release) {
      DEFINES += NDEBUG
  }
  

-- 
QtWebKit packaging