[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.1-2-2-g9c2d1f8

Sun Jun 27 13:42:22 UTC 2010

The following commit has been merged in the debian/unstable branch:
commit 9c2d1f840ad8668f63785521b5832fd700036213
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sun Jun 27 09:41:28 2010 -0400

    use system libtool

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 68bcc1c..159def7 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -132,9 +132,14 @@ DIST_COMMON = README $(am__configure_deps) $(am__noinst_HEADERS_DIST) \
 	$(srcdir)/autotoolsconfig.h.in \
 	$(top_srcdir)/WebKit/gtk/webkit.pc.in \
 	$(top_srcdir)/WebKit/gtk/webkit/webkitversion.h.in \
-	$(top_srcdir)/configure ChangeLog INSTALL autotools/compile \
-	autotools/config.guess autotools/config.sub autotools/depcomp \
-	autotools/install-sh autotools/ltmain.sh autotools/missing
+	$(top_srcdir)/configure ChangeLog INSTALL \
+	/usr/share/libtool/config/compile \
+	/usr/share/libtool/config/config.guess \
+	/usr/share/libtool/config/config.sub \
+	/usr/share/libtool/config/depcomp \
+	/usr/share/libtool/config/install-sh \
+	/usr/share/libtool/config/ltmain.sh \
+	/usr/share/libtool/config/missing
 @TARGET_WIN32_TRUE at am__append_14 = \
 @TARGET_WIN32_TRUE@	JavaScriptCore/wtf/ThreadSpecificWin.cpp \
 @TARGET_WIN32_TRUE@	JavaScriptCore/jit/ExecutableAllocatorWin.cpp \
@@ -1440,15 +1445,14 @@ DIST_COMMON = README $(am__configure_deps) $(am__noinst_HEADERS_DIST) \
 
 @TARGET_X11_TRUE at am__append_138 = TestNetscapePlugin/libtestnetscapeplugin.la
 subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \
-	$(top_srcdir)/autotools/dolt.m4 \
-	$(top_srcdir)/autotools/gtk-doc.m4 \
-	$(top_srcdir)/autotools/libtool.m4 \
-	$(top_srcdir)/autotools/ltoptions.m4 \
-	$(top_srcdir)/autotools/ltsugar.m4 \
-	$(top_srcdir)/autotools/ltversion.m4 \
-	$(top_srcdir)/autotools/lt~obsolete.m4 \
+ACLOCAL_M4 = /usr/share/libtool/libltdl/aclocal.m4 
+am__aclocal_m4_deps = $(top_srcdir)/autotools/dolt.m4 \
+	/usr/share/aclocal/gtk-doc.m4 \
+	/usr/share/aclocal/libtool.m4 \
+	/usr/share/aclocal/ltoptions.m4 \
+	/usr/share/aclocal/ltsugar.m4 \
+	/usr/share/aclocal/ltversion.m4 \
+	/usr/share/aclocal/lt~obsolete.m4 \
 	$(top_srcdir)/autotools/webkit.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -5888,7 +5892,7 @@ Programs_unittests_testwindow_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(Programs_unittests_testwindow_CFLAGS) $(CFLAGS) \
 	$(Programs_unittests_testwindow_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. at am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
+depcomp = $(SHELL) /usr/share/libtool/config/depcomp 
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
diff --git a/WebKit/gtk/docs/GNUmakefile.in b/WebKit/gtk/docs/GNUmakefile.in
index 32427d2..4e9f70d 100644
--- a/WebKit/gtk/docs/GNUmakefile.in
+++ b/WebKit/gtk/docs/GNUmakefile.in
@@ -42,15 +42,14 @@ host_triplet = @host@
 DIST_COMMON = $(srcdir)/GNUmakefile.am $(srcdir)/GNUmakefile.in \
 	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
 subdir = WebKit/gtk/docs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \
-	$(top_srcdir)/autotools/dolt.m4 \
-	$(top_srcdir)/autotools/gtk-doc.m4 \
-	$(top_srcdir)/autotools/libtool.m4 \
-	$(top_srcdir)/autotools/ltoptions.m4 \
-	$(top_srcdir)/autotools/ltsugar.m4 \
-	$(top_srcdir)/autotools/ltversion.m4 \
-	$(top_srcdir)/autotools/lt~obsolete.m4 \
+ACLOCAL_M4 = /usr/share/libtool/libltdl/aclocal.m4 
+am__aclocal_m4_deps = $(top_srcdir)/autotools/dolt.m4 \
+	/usr/share/aclocal/gtk-doc.m4 \
+	/usr/share/aclocal/libtool.m4 \
+	/usr/share/aclocal/ltoptions.m4 \
+	/usr/share/aclocal/ltsugar.m4 \
+	/usr/share/aclocal/ltversion.m4 \
+	/usr/share/aclocal/lt~obsolete.m4 \
 	$(top_srcdir)/autotools/webkit.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/configure.ac b/configure.ac
index dbba3f8..d742b63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,9 @@ m4_define([webkit_user_agent_minor_version], [2])
 
 AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
-AC_CONFIG_MACRO_DIR([autotools])
-AC_CONFIG_AUX_DIR([autotools])
-AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools")
+AC_CONFIG_MACRO_DIR([/usr/share/libtool/config])
+AC_CONFIG_AUX_DIR([/usr/share/libtool/config])
+AC_SUBST(ACLOCAL_AMFLAGS, "-I /usr/share/libtool/config")
 
 AC_CONFIG_HEADERS([autotoolsconfig.h])
 AC_CANONICAL_HOST
diff --git a/debian/changelog b/debian/changelog
index b711931..c0ea2f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-webkit (1.2.1-3) UNRELEASED; urgency=high
+webkit (1.2.1-3) UNRELEASED; urgency=low
 
+  * Use system libtool.
   * Turn direct source changes into a patch.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Thu, 27 May 2010 20:36:41 -0400
diff --git a/debian/control b/debian/control
index e134781..1d2cc7c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,10 @@ Build-Depends: debhelper (>= 5.0),
                libgail-dev,
                libgirepository1.0-dev (>= 0.6.2),
                gir-repository-dev (>= 0.6.2),
-               gobject-introspection (>= 0.6.2)
+               gobject-introspection (>= 0.6.2),
+               gtk-doc-tools,
+               libltdl-dev,
+               autoconf
 Standards-Version: 3.8.4
 Homepage: http://webkit.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
diff --git a/debian/patches/series b/debian/patches/series
index ea397c6..1b2f88b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-fix-bashism-in-build.diff
 02-pool-fixup-and-sparc-support.patch
+03-use-system-libtool.patch
diff --git a/debian/rules b/debian/rules
index 16d066c..9e26d28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,10 +33,6 @@ clean:
 	rm -rf build
 	rm -f WebKit/gtk/docs/version.xml
 
-	for file in config.guess config.sub; do \
-		sed -i '2!b;/^exec "/ d' autotools/$$file ; \
-	done
-
 	dh_clean
 
 build: build-stamp
@@ -44,17 +40,19 @@ 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'" "$$@"' autotools/$$file ; \
+	[ ! -d build ] && mkdir build || true
+	for file in * ; do \
+		[ "$$file" != "build" ] && [ "$$file" != "debian" ] \
+		&& cp -r $$file build || true ; \
 	done
 
-	[ ! -d build ] && mkdir build || true
+	cd build && autoconf
 	cd build && \
 	CFLAGS="$(CFLAGS)" \
 	CXXFLAGS="$(CFLAGS)" \
 	CC="gcc -Wl,--as-needed" \
 	CXX="g++ -Wl,--as-needed" \
-	../configure --prefix=/usr \
+	./configure --prefix=/usr \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--enable-gtk-doc \
@@ -67,8 +65,7 @@ build-stamp:
 	# succeeds.
 	ln -fs ../../../build/WebKit/gtk/docs/version.xml \
 		WebKit/gtk/docs/
-	cd build/WebKit/gtk/docs && \
-		make docs || make docs
+	cd build/WebKit/gtk/docs && make docs
 
 	touch $@
 
@@ -88,7 +85,7 @@ install-stamp: build-stamp
 	chrpath -d "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0-2/libexec/GtkLauncher
 
 	install -d -m 755 debian/tmp/usr/share/doc/libwebkit-dev/html
-	install -m 644 WebKit/gtk/docs/html/* \
+	install -m 644 build/WebKit/gtk/docs/html/* \
 		debian/tmp/usr/share/doc/libwebkit-dev/html/
 
 	touch $@

-- 
WebKit Debian packaging

