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

[Gustavo Noronha Silva]

The following commit has been merged in the debian/experimental branch:
commit 6861899552f89acaa67b5744e41ac8da1ebc6619
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Thu Jan 13 10:38:17 2011 -0200

    Fix autotools directory location.

diff --git a/debian/changelog b/debian/changelog
index dfd5e0e..91b080d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ webkit (1.3.10-1) experimental; urgency=low
   * debian/control:
   - Build-Depend on GTK+3 >= 2.99.1 to avoid problems with the multiple
     breakages
+  * debian/rules:
+  - adapt for source layout changes
 
- -- Gustavo Noronha Silva <kov at debian.org>  Thu, 13 Jan 2011 10:34:19 -0200
+ -- Gustavo Noronha Silva <kov at debian.org>  Thu, 13 Jan 2011 10:37:55 -0200
 
 webkit (1.3.9-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 43bb6ef..c4568cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,19 +39,21 @@ clean:
 		make maintainer-clean
 
 	-rm -rf WebKit/gtk/docs/xml* WebKit/gtk/docs/html* WebKit/gtk/docs/sgml.stamp WebKit/gtk/docs/tmpl*
-	-rm WebKit/gtk/docs/webkitgtk.prerequisites webkit-1.3.9/WebKit/gtk/docs/tmpl.stamp \
+	-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
+		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
 
 	for file in config.guess config.sub; do \
-		sed -i '2!b;/^exec "/ d' autotools/$$file ; \
+		sed -i '2!b;/^exec "/ d' Source/autotools/$$file ; \
 	done
 
 	dh_clean
@@ -62,7 +64,7 @@ build-stamp:
 	dh_testdir
 
 	for file in config.guess config.sub; do \
-		sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' autotools/$$file ; \
+		sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' Source/autotools/$$file ; \
 	done
 
 	for version in $(GTK_VERSIONS); do \

-- 
WebKit Debian packaging