[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 15:59:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 773961b5f2ee6c5cd2d3094bcb749ab07092b39f
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 17 19:24:28 2010 +0000
Unreviewed buildfix.
[Qt] D'oh! I screwed up the dependencies.
* DerivedSources.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72224 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5868d8a..b62892c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-17 Andras Becsi <abecsi at webkit.org>
+
+ Unreviewed buildfix.
+
+ [Qt] D'oh! I screwed up the dependencies.
+
+ * DerivedSources.pro:
+
2010-11-17 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index f44fe37..fa646e4 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -111,14 +111,14 @@ SCRIPTS = \
$$PWD/Scripts/webkit2/messages.py
ualist_copier.commands = $(COPY_FILE) $${SRC_ROOT_DIR}/WebKitTools/QtTestBrowser/useragentlist.txt $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/useragentlist.txt
-ualist_copier.depends = $${SRC_ROOT_DIR}/WebKitTools/QtTestBrowser/useragentlist.txt $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
+ualist_copier.depends = $${SRC_ROOT_DIR}/WebKitTools/QtTestBrowser/useragentlist.txt
ualist_copier.input = $${SRC_ROOT_DIR}/WebKitTools/QtTestBrowser/useragentlist.txt
ualist_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/useragentlist.txt
generated_files.depends += ualist_copier
QMAKE_EXTRA_TARGETS += ualist_copier
qrc_copier.commands = $(COPY_FILE) $${SRC_ROOT_DIR}/WebKitTools/MiniBrowser/MiniBrowser.qrc $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
-qrc_copier.depends = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/useragentlist.txt $${SRC_ROOT_DIR}/WebKitTools/MiniBrowser/MiniBrowser.qrc
+qrc_copier.depends = ualist_copier $${SRC_ROOT_DIR}/WebKitTools/MiniBrowser/MiniBrowser.qrc
qrc_copier.input = $${SRC_ROOT_DIR}/WebKitTools/MiniBrowser/MiniBrowser.qrc
qrc_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
generated_files.depends += qrc_copier
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list