[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn29752-1-1645-gd3fe478

[Mike Hommey]

The following commit has been merged in the debian/unstable branch:
commit 144f82761396ab82eefd8fda26e6432a0b6e4885
Author: Mike Hommey <glandium at debian.org>
Date:   Sat Apr 12 17:13:06 2008 +0200

    Revert previous changes to qmake build system
    
    We don't use qmake anymore, so we can just revert these changes, now.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index b02d78f..f108df6 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1871,7 +1871,7 @@ qt-port:!CONFIG(QTDIR_build) {
     prf.files = $$PWD/../WebKit/qt/Api/qtwebkit.prf
     prf.path = $$[QT_INSTALL_PREFIX]/mkspecs/features
 
-    #VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
     win32-* {
         DLLDESTDIR = $$OUTPUT_DIR/bin
diff --git a/WebKit.pro b/WebKit.pro
index 9af411c..bc14feb 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -7,7 +7,8 @@ qt-port {
     }
 }
 SUBDIRS += \
-        WebCore
+        WebCore \
+        JavaScriptCore/kjs/testkjs.pro
 
 qt-port {
     SUBDIRS += WebKit/qt/QtLauncher
diff --git a/debian/changelog b/debian/changelog
index 84dfcab..2d5b251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ webkit (0~svn31841-1) UNRELEASED; urgency=low
     instead.
   * debian/libwebkitgtk-dev.install: Remove the .prl file that was generated
     by qmake.
+  * WebCore/WebCore.pro, WebKit.pro: Revert previous changes, as we don't use
+    qmake anymore.
 
  -- Mike Hommey <glandium at debian.org>  Sat, 12 Apr 2008 11:47:32 +0200
 

-- 
WebKit Debian packaging