[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-beta2-1-1-ge38fda0

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit e38fda0480b08fe103a5df57486c781da0cea4f7
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jul 13 16:26:49 2010 +0300

    Fix qt_webkit_version.pri conflict, installed inconditionaly.
---
 debian/changelog                                   |    7 +++++++
 .../0001_qt_webkit_version.pri_conflict.diff       |   14 ++++++++++++++
 debian/patches/series                              |    3 +++
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b892422..86453be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.7.0~beta2-2) experimental; urgency=low
+
+  * Add 0001_qt_webkit_version.pri_conflict.diff:
+    Fix qt_webkit_version.pri conflict, installed inconditionaly.
+
+ -- Fathi Boudra <fabo at debian.org>  Tue, 13 Jul 2010 16:20:28 +0300
+
 qt4-x11 (4:4.7.0~beta2-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/0001_qt_webkit_version.pri_conflict.diff b/debian/patches/0001_qt_webkit_version.pri_conflict.diff
new file mode 100644
index 0000000..9547075
--- /dev/null
+++ b/debian/patches/0001_qt_webkit_version.pri_conflict.diff
@@ -0,0 +1,14 @@
+Description: qt_webkit_version.pri is installed inconditionaly.
+             the file conficts when Qt WebKit is standalone.
+Author: Simon Hausmann <simon.hausmann at nokia.com>
+
+--- a/projects.pro
++++ b/projects.pro
+@@ -164,6 +164,7 @@ unix {
+    DEFAULT_QMAKESPEC = $$QMAKESPEC
+    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
+    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
++   !contains(QT_CONFIG, webkit): mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/modules/qt_webkit_version.pri
+ }
+ win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) {
+     # When shadow building on Windows, the default mkspec only exists in the build tree.
diff --git a/debian/patches/series b/debian/patches/series
index ab367e1..493438b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+# upstream patches
+0001_qt_webkit_version.pri_conflict.diff
+
 # qt-copy patches
 0180-window-role.diff
 0195-compositing-properties.diff

-- 
Qt 4 packaging