[SCM] QtWebKit packaging branch, master, updated. 700119d2e171e5eee22b86304373adcb697d6e13

[Fathi Boudra]

The following commit has been merged in the master branch:
commit d6cbfa4b2a65e2cc5a814f2a6c288519ee5abdf5
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jun 29 14:11:36 2010 +0300

    Remove patches stolen upstream
---
 .../0001_fix_qtwebkit.pc_corruption_bug36826.diff  |   17 -----------------
 debian/patches/series                              |    1 -
 2 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/debian/patches/0001_fix_qtwebkit.pc_corruption_bug36826.diff b/debian/patches/0001_fix_qtwebkit.pc_corruption_bug36826.diff
deleted file mode 100644
index b4dfb65..0000000
--- a/debian/patches/0001_fix_qtwebkit.pc_corruption_bug36826.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix a QtWebKit.pc corruption problem. The problem occurs while
-             installing QtWebKit from trunk or a source package.
-Author: Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
-Origin: upstream, http://trac.webkit.org/changeset/60475
-Bug: https://bugs.webkit.org/show_bug.cgi?id=36826
-
---- a/WebCore/WebCore.pro
-+++ b/WebCore/WebCore.pro
-@@ -2875,7 +2875,7 @@ HEADERS += $$WEBKIT_API_HEADERS
-         QMAKE_PKGCONFIG_LIBDIR = $$target.path
-         QMAKE_PKGCONFIG_INCDIR = $$headers.path
-         QMAKE_PKGCONFIG_DESTDIR = pkgconfig
--        lib_replace.match = $$DESTDIR
-+        lib_replace.match = $$re_escape($$DESTDIR)
-         lib_replace.replace = $$[QT_INSTALL_LIBS]
-         QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 20cc4ee..14e9b0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # upstream patches
-0001_fix_qtwebkit.pc_corruption_bug36826.diff
 
 # debian patches
 #01_hide_std_symbols.diff

-- 
QtWebKit packaging