[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-20-gca5d287

[Pino Toscano]

The following commit has been merged in the master branch:
commit ca5d287327b1744f55cb629928aa367ebf549557
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 20 11:35:45 2011 +0200

    no_gc_sections.diff: refresh to apply cleanly
---
 debian/changelog                   |    1 +
 debian/patches/no_gc_sections.diff |   12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8911323..4434612 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
   * Update patches:
     - 0001_fix_symbols_visibility_for_webcore.diff: drop, stolen upstream.
     - 05_sparc_unaligned_access.diff: refresh
+    - no_gc_sections.diff: refresh
 
   [ Pino Toscano ]
   * Use wildcard architectures: (Closes: #634388)
diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff
index 86cbfc0..ecda3d0 100644
--- a/debian/patches/no_gc_sections.diff
+++ b/debian/patches/no_gc_sections.diff
@@ -8,17 +8,17 @@ Forwarded: no
 Last-Update: 2011-03-28 (mips* and arm* added)
 
 ---
- WebCore/WebCore.pro |    2 +-
+ WebCore/WebCore.pri |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/Source/WebCore/WebCore.pro
-+++ b/Source/WebCore/WebCore.pro
-@@ -91,7 +91,7 @@ unix {
+--- a/Source/WebCore/WebCore.pri
++++ b/Source/WebCore/WebCore.pri
+@@ -326,7 +326,7 @@ mac {
  }
  
- unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
+ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
 +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--gc-sections
  linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  
- CONFIG(release) {
+ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork

-- 
QtWebKit packaging