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

Fathi Boudra fabo at alioth.debian.org
Tue Jul 13 16:58:32 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit f90dd09c3453942c156e4960e746d918146e2389
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jul 13 19:57:45 2010 +0300

    Fix 0001_qt_webkit_version.pri_conflict.diff patch
---
 .../0001_qt_webkit_version.pri_conflict.diff       |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0001_qt_webkit_version.pri_conflict.diff b/debian/patches/0001_qt_webkit_version.pri_conflict.diff
index 9547075..6330e1d 100644
--- a/debian/patches/0001_qt_webkit_version.pri_conflict.diff
+++ b/debian/patches/0001_qt_webkit_version.pri_conflict.diff
@@ -4,11 +4,14 @@ Author: Simon Hausmann <simon.hausmann at nokia.com>
 
 --- a/projects.pro
 +++ b/projects.pro
-@@ -164,6 +164,7 @@ unix {
+@@ -163,7 +163,9 @@ mkspecs.files=$$QT_BUILD_TREE/mkspecs/qc
+ 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
+-   mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
++   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.

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list