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

Michael Gilbert michael.s.gilbert at gmail.com
Tue Jul 6 23:54:42 UTC 2010 

The following commit has been merged in the debian/unstable branch:
commit 20d40bada8207824a080974a71affb72b1a6f32f
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Tue Jul 6 19:55:54 2010 -0400

    revert system libtool changes

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 159def7..2a63213 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -132,14 +132,9 @@ 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 \
-	/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
+	$(top_srcdir)/configure ChangeLog INSTALL autotools/compile \
+	autotools/config.guess autotools/config.sub autotools/depcomp \
+	autotools/install-sh autotools/ltmain.sh autotools/missing
 @TARGET_WIN32_TRUE at am__append_14 = \
 @TARGET_WIN32_TRUE@	JavaScriptCore/wtf/ThreadSpecificWin.cpp \
 @TARGET_WIN32_TRUE@	JavaScriptCore/jit/ExecutableAllocatorWin.cpp \
@@ -1445,14 +1440,15 @@ DIST_COMMON = README $(am__configure_deps) $(am__noinst_HEADERS_DIST) \
 
 @TARGET_X11_TRUE at am__append_138 = TestNetscapePlugin/libtestnetscapeplugin.la
 subdir = .
-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 \
+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 \
 	$(top_srcdir)/autotools/webkit.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -5892,7 +5888,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) /usr/share/libtool/config/depcomp 
+depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -9218,7 +9214,9 @@ libWebCoreJS_depfiles := $(patsubst \
 webinspectordir = ${datadir}/webkit-1.0/webinspector
 dist_webinspector_DATA = \
 	$(WebCore)/English.lproj/localizedStrings.js \
-	$(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
+	$(shell ls $(WebCore)/inspector/front-end/*.js) \
+	$(shell ls $(WebCore)/inspector/front-end/*.html) \
+	$(shell ls $(WebCore)/inspector/front-end/*.css)
 
 webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
 dist_webinspectorimages_DATA = \
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 416f00c..fb45261 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3768,7 +3768,9 @@ webcore_dist += \
 webinspectordir = ${datadir}/webkit-1.0/webinspector
 dist_webinspector_DATA = \
 	$(WebCore)/English.lproj/localizedStrings.js \
-	$(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
+	$(shell ls $(WebCore)/inspector/front-end/*.js) \
+	$(shell ls $(WebCore)/inspector/front-end/*.html) \
+	$(shell ls $(WebCore)/inspector/front-end/*.css)
 
 webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
 dist_webinspectorimages_DATA = \
diff --git a/WebKit/gtk/docs/GNUmakefile.in b/WebKit/gtk/docs/GNUmakefile.in
index 4e9f70d..32427d2 100644
--- a/WebKit/gtk/docs/GNUmakefile.in
+++ b/WebKit/gtk/docs/GNUmakefile.in
@@ -42,14 +42,15 @@ 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 = /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 \
+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 \
 	$(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 d742b63..dbba3f8 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([/usr/share/libtool/config])
-AC_CONFIG_AUX_DIR([/usr/share/libtool/config])
-AC_SUBST(ACLOCAL_AMFLAGS, "-I /usr/share/libtool/config")
+AC_CONFIG_MACRO_DIR([autotools])
+AC_CONFIG_AUX_DIR([autotools])
+AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools")
 
 AC_CONFIG_HEADERS([autotoolsconfig.h])
 AC_CANONICAL_HOST
diff --git a/debian/changelog b/debian/changelog
index fb66d82..42efc41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,7 @@
 webkit (1.2.1-3) UNRELEASED; urgency=low
 
-  * Use system libtool.
-  - Drop 01-fix-bashism-in-build.diff (handled automatically by system libtool).
   * Turn direct source changes into a patch.
-  * Fix cve-2010-1368: geolocation information disclosure.
+  * Fix cve-2010-1386: geolocation information disclosure.
   * Fix cve-2010-1392: possible code execution in html button logic.
   * Fix cve-2010-1405: possible code execution in vertical positioning logic.
   * Fix cve-2010-1407: iframe information disclosure.
@@ -23,13 +21,13 @@ webkit (1.2.1-3) UNRELEASED; urgency=low
   * Fix cve-2010-1760: user credential information disclosure.
   * Fix cve-2010-1761: possible code execution in frameview logic.
   * Fix cve-2010-1762: webscript and/or html injection using the textarea
+    element.
   * Fix cve-2010-1770: possible code execution due to improper handling of the
     ibm1147 character set.
   * Fix cve-2010-1771: possible code execution due to improper font handling.
   * Fix cve-2010-1772: geolocation disconnectframe timer issue.
   * Fix cve-2010-1773: integer overflow in alphabet conversion.
   * Fix cve-2010-1774: integer overflow in table layout handling.
-    element.
 
  -- 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 1d2cc7c..e134781 100644
--- a/debian/control
+++ b/debian/control
@@ -24,10 +24,7 @@ Build-Depends: debhelper (>= 5.0),
                libgail-dev,
                libgirepository1.0-dev (>= 0.6.2),
                gir-repository-dev (>= 0.6.2),
-               gobject-introspection (>= 0.6.2),
-               gtk-doc-tools,
-               libltdl-dev,
-               autoconf
+               gobject-introspection (>= 0.6.2)
 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/01-fix-bashism-in-build.patch b/debian/patches/01-fix-bashism-in-build.patch
new file mode 100644
index 0000000..c1c5d33
--- /dev/null
+++ b/debian/patches/01-fix-bashism-in-build.patch
@@ -0,0 +1,30 @@
+diff --git a/GNUmakefile.in b/GNUmakefile.in
+index 68bcc1c..2a63213 100644
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -9214,7 +9214,9 @@ libWebCoreJS_depfiles := $(patsubst \
+ webinspectordir = ${datadir}/webkit-1.0/webinspector
+ dist_webinspector_DATA = \
+ 	$(WebCore)/English.lproj/localizedStrings.js \
+-	$(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
++	$(shell ls $(WebCore)/inspector/front-end/*.js) \
++	$(shell ls $(WebCore)/inspector/front-end/*.html) \
++	$(shell ls $(WebCore)/inspector/front-end/*.css)
+ 
+ webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
+ dist_webinspectorimages_DATA = \
+diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
+index 416f00c..fb45261 100644
+--- a/WebCore/GNUmakefile.am
++++ b/WebCore/GNUmakefile.am
+@@ -3768,7 +3768,9 @@ webcore_dist += \
+ webinspectordir = ${datadir}/webkit-1.0/webinspector
+ dist_webinspector_DATA = \
+ 	$(WebCore)/English.lproj/localizedStrings.js \
+-	$(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
++	$(shell ls $(WebCore)/inspector/front-end/*.js) \
++	$(shell ls $(WebCore)/inspector/front-end/*.html) \
++	$(shell ls $(WebCore)/inspector/front-end/*.css)
+ 
+ webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
+ dist_webinspectorimages_DATA = \
diff --git a/debian/patches/series b/debian/patches/series
index 716d91a..85f95e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
+01-fix-bashism-in-build.patch
 02-pool-fixup-and-sparc-support.patch
-03-use-system-libtool.patch
 
 # security patches
 cve-2010-1386.patch
diff --git a/debian/rules b/debian/rules
index 00755ef..68f590e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,10 @@ clean:
 	dh_testroot
 
 	rm -f build-stamp install-stamp
+	-test -d build/WebKit/gtk/docs && cd build/WebKit/gtk/docs && \
+	    make maintainer-clean
 	rm -rf build
+	rm -f WebKit/gtk/docs/version.xml
 
 	dh_clean
 
@@ -37,18 +40,12 @@ build-stamp:
 	dh_testdir
 
 	[ ! -d build ] && mkdir build || true
-	for file in * ; do \
-		[ "$$file" != "build" ] && [ "$$file" != "debian" ] \
-		&& cp -r $$file build || true ; \
-	done
-
-	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 \
@@ -59,6 +56,7 @@ build-stamp:
 	# Awesome hack to get the docs built! For some reason, the
 	# first call to make docs fails mid-work, but the second
 	# succeeds.
+	ln -fs ../../../build/WebKit/gtk/docs/version.xml WebKit/gtk/docs
 	cd build/WebKit/gtk/docs && make docs
 
 	touch $@
@@ -79,8 +77,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 build/WebKit/gtk/docs/html/* \
-		debian/tmp/usr/share/doc/libwebkit-dev/html/
+	install -m 644 WebKit/gtk/docs/html/* debian/tmp/usr/share/doc/libwebkit-dev/html/
 
 	touch $@
 

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list