[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-2805-g02f8816

[Gustavo Noronha Silva]

The following commit has been merged in the debian/experimental branch:
commit 53f730866fde33c70fc3ba6bf2abae3fcd89040e
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Sun Feb 20 15:30:26 2011 -0300

    Adapt rules file to changes in source code layout

diff --git a/debian/rules b/debian/rules
index 2fe5852..7b99d52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,23 +34,23 @@ clean:
 	dh_testroot
 
 	rm -f build-stamp install-stamp
-	-test -d build/WebKit/gtk/docs && \
-		cd build/WebKit/gtk/docs && \
+	-test -d build/Source/WebKit/gtk/docs && \
+		cd build/Source/WebKit/gtk/docs && \
 		make maintainer-clean
 
-	-rm -rf WebKit/gtk/docs/xml* WebKit/gtk/docs/html* WebKit/gtk/docs/sgml.stamp WebKit/gtk/docs/tmpl*
-	-for file in WebKit/gtk/docs/webkitgtk.prerequisites WebKit/gtk/docs/tmpl.stamp \
-		WebKit/gtk/docs/webkitgtk-overrides.txt WebKit/gtk/docs/webkitgtk.args \
-		WebKit/gtk/docs/webkitgtk.interfaces WebKit/gtk/docs/webkitgtk.signals \
-		WebKit/gtk/docs/webkitgtk.hierarchy WebKit/gtk/docs/tmpl/webkitgtk-unused.sgml \
-		WebKit/gtk/docs/webkitgtk-decl-list.txt WebKit/gtk/docs/webkitgtk-decl.txt \
-		WebKit/gtk/docs/webkitgtk-undeclared.txt WebKit/gtk/docs/webkitgtk-undocumented.txt \
-		WebKit/gtk/docs/webkitgtk-unused.txt; do \
+	-rm -rf Source/WebKit/gtk/docs/xml* Source/WebKit/gtk/docs/html* Source/WebKit/gtk/docs/sgml.stamp Source/WebKit/gtk/docs/tmpl*
+	-for file in Source/WebKit/gtk/docs/webkitgtk.prerequisites Source/WebKit/gtk/docs/tmpl.stamp \
+		Source/WebKit/gtk/docs/webkitgtk-overrides.txt Source/WebKit/gtk/docs/webkitgtk.args \
+		Source/WebKit/gtk/docs/webkitgtk.interfaces Source/WebKit/gtk/docs/webkitgtk.signals \
+		Source/WebKit/gtk/docs/webkitgtk.hierarchy Source/WebKit/gtk/docs/tmpl/webkitgtk-unused.sgml \
+		Source/WebKit/gtk/docs/webkitgtk-decl-list.txt Source/WebKit/gtk/docs/webkitgtk-decl.txt \
+		Source/WebKit/gtk/docs/webkitgtk-undeclared.txt Source/WebKit/gtk/docs/webkitgtk-undocumented.txt \
+		Source/WebKit/gtk/docs/webkitgtk-unused.txt; do \
 		rm -f ${file}; \
 	done
 	rm -rf build-*
 	rm -rf debian/tmp-*
-	rm -f WebKit/gtk/docs/version.xml
+	rm -f Source/WebKit/gtk/docs/version.xml
 
 	for file in config.guess config.sub; do \
 		sed -i '2!b;/^exec "/ d' Source/autotools/$$file ; \
@@ -94,9 +94,9 @@ build-stamp:
 	# first call to make docs fails mid-work, but the second
 	# succeeds.
 	for version in $(GTK_VERSIONS); do \
-		ln -fs ../../../build-$${version}/WebKit/gtk/docs/version.xml \
-			WebKit/gtk/docs/; \
-		cd build-$${version}/WebKit/gtk/docs; \
+		ln -fs ../../../build-$${version}/Source/WebKit/gtk/docs/version.xml \
+			Source/WebKit/gtk/docs/; \
+		cd build-$${version}/Source/WebKit/gtk/docs; \
 		make docs || make docs; \
 		cd ..; \
 	done
@@ -118,8 +118,9 @@ ifeq (2.0,$(filter 2.0,$(GTK_VERSIONS)))
 	chrpath -d debian/tmp-2.0/usr/lib/webkitgtk-1.0-0/libexec/GtkLauncher
 
 	install -d -m 755 debian/tmp-2.0/usr/share/doc/libwebkitgtk-dev/html
-	install -m 644 WebKit/gtk/docs/html/* \
-		debian/tmp-2.0/usr/share/doc/libwebkitgtk-dev/html/
+	# FIXME: broken upstream
+	#install -m 644 Source/WebKit/gtk/docs/html/* \
+	#	debian/tmp-2.0/usr/share/doc/libwebkitgtk-dev/html/
 
 	mv debian/tmp-2.0/usr/share/webkit-1.0 \
 		debian/tmp-2.0/usr/share/webkitgtk-1.0
@@ -132,8 +133,9 @@ ifeq (3.0,$(filter 3.0,$(GTK_VERSIONS)))
 	chrpath -d debian/tmp-3.0/usr/lib/webkitgtk-3.0-0/libexec/GtkLauncher
 
 	install -d -m 755 debian/tmp-3.0/usr/share/doc/libwebkitgtk-3.0-dev/html
-	install -m 644 WebKit/gtk/docs/html/* \
-		debian/tmp-3.0/usr/share/doc/libwebkitgtk-3.0-dev/html/
+	# FIXME: broken upstream
+	# install -m 644 Source/WebKit/gtk/docs/html/* \
+	# 	debian/tmp-3.0/usr/share/doc/libwebkitgtk-3.0-dev/html/
 
 	mv debian/tmp-3.0/usr/share/webkit-3.0 \
 		debian/tmp-3.0/usr/share/webkitgtk-3.0

-- 
WebKit Debian packaging