[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.0.1-4-2877-g8fe555b

[Mike Hommey]

The following commit has been merged in the debian/experimental branch:
commit 1ea3a02eb1d26fa999965195e0117f3d05d6e0ac
Author: Mike Hommey <glandium at debian.org>
Date:   Sat Oct 25 09:35:34 2008 +0200

    Use config.guess and config.sub from autotools-dev

diff --git a/debian/changelog b/debian/changelog
index 668cd0e..0f4b5c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ webkit (1.0.2~pre.svn37878-1) UNRELEASED; urgency=low
     - Bump shlibs because of some new symbols.
     - Don't need --enable-svg-experimental anymore.
     - Feed configure with --host and --build.
-  * debian/control: Don't build depend on autotools.
+    - Use config.guess and config.sub from autotools-dev.
+  * debian/control: Don't build depend on autoconf/automake/libtool, but
+    autotools-dev, instead.
   * GNUmakefile.am, GNUmakefile.in: Add missing dash in version script option.
   * debian/libwebkit-1.0-1.symbols: Add new symbols.
 
diff --git a/debian/control b/debian/control
index ddbcbad..cf77094 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: web
 Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers at lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium at debian.org>
-Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libcurl4-dev, libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev
+Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libcurl4-dev, libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev, autotools-dev
 Standards-Version: 3.8.0.1
 Homepage: http://webkit.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
diff --git a/debian/rules b/debian/rules
index a22bedc..d21dd36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,10 @@ clean:
 	rm -f build-stamp install-stamp
 	rm -rf build
 
+	for file in config.guess config.sub; do \
+		sed -i '2!b;/^exec "/ d' $$file ; \
+	done
+
 	dh_clean
 
 build: build-stamp
@@ -32,6 +36,10 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
+	for file in config.guess config.sub; do \
+		sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' $$file ; \
+	done
+
 	[ ! -d build ] && mkdir build || true
 	cd build && \
 	CFLAGS="$(CFLAGS)" \

-- 
WebKit Debian packaging