[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
alex at webkit.org
alex at webkit.org
Wed Dec 22 12:22:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0cfa34faacc1b132b5fb3ce9ce99b8262fdf8b84
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 20 15:13:55 2010 +0000
2010-08-20 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
[REGRESSION] r65608 broke gtk distcheck
https://bugs.webkit.org/show_bug.cgi?id=44333
Define the inspector.html as a noinst_DATA intead of using the dir
suffix, which is used for installation.
* GNUmakefile.am:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65735 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8a43dbc..cccd33f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-20 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [REGRESSION] r65608 broke gtk distcheck
+ https://bugs.webkit.org/show_bug.cgi?id=44333
+
+ Define the inspector.html as a noinst_DATA intead of using the dir
+ suffix, which is used for installation.
+
+ * GNUmakefile.am:
+
2010-08-19 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 20baf0f..551198f 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -4636,9 +4636,8 @@ dist_webinspectorimages_DATA = \
$(shell ls $(WebCore)/inspector/front-end/Images/*.gif) \
$(shell ls $(WebCore)/inspector/front-end/Images/*.png)
-noinst_webinspectordir = ${GENSOURCES_INSPECTOR}
-noinst_webinspector_SCRIPTS = ${GENSOURCES_INSPECTOR}/inspector.html
-${GENSOURCES_INSPECTOR}/inspector.html :
+noinst_DATA = ${GENSOURCES_INSPECTOR}/inspector.html
+${GENSOURCES_INSPECTOR}/inspector.html:
mkdir -p ${GENSOURCES_INSPECTOR}/images
cp ${dist_webinspector_DATA} ${GENSOURCES_INSPECTOR}
cp ${dist_webinspectorimages_DATA} ${GENSOURCES_INSPECTOR}/images
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list