[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.6-2-515-g1db0d2f

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 1db0d2f79b6661b6e064a47b1cc635568ff68d86
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Fri May 15 14:17:17 2009 -0300

    Build and ship gtk-doc documentation

diff --git a/debian/changelog b/debian/changelog
index f489fb0..fb218c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ webkit (1.1.7-1) unstable; urgency=low
   * New upstream release
   * debian/libwebkit-1.0-2.symbols:
   - updated with the new symbols in 1.1.7
+  * debian/libwebkit-dev.install, debian/libwebkit-dev.links,
+    debian/rules:
+  - Build, and ship gtk-doc documentation (Closes: #526683)
 
- -- Gustavo Noronha Silva <kov at debian.org>  Fri, 15 May 2009 11:36:32 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Fri, 15 May 2009 14:16:43 -0300
 
 webkit (1.1.6-2) unstable; urgency=low
 
diff --git a/debian/libwebkit-dev.install b/debian/libwebkit-dev.install
index 09082ca..28103df 100644
--- a/debian/libwebkit-dev.install
+++ b/debian/libwebkit-dev.install
@@ -1,3 +1,4 @@
 usr/lib/libwebkit-1.0.so
 usr/include/webkit-1.0
 usr/lib/pkgconfig/webkit-1.0.pc
+usr/share/doc/libwebkit-dev
diff --git a/debian/libwebkit-dev.links b/debian/libwebkit-dev.links
new file mode 100644
index 0000000..bca3109
--- /dev/null
+++ b/debian/libwebkit-dev.links
@@ -0,0 +1 @@
+usr/share/doc/libwebkit-dev/html usr/share/gtk-doc/html/webkitgtk
diff --git a/debian/rules b/debian/rules
index 96c2553..8c9d6a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,11 @@ 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
 
 	for file in config.guess config.sub; do \
 		sed -i '2!b;/^exec "/ d' autotools/$$file ; \
@@ -48,10 +52,19 @@ build-stamp:
 	CXX="g++ -Wl,--as-needed" \
 	../configure --prefix=/usr \
 		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE)
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--enable-gtk-doc
 
 	$(MAKE) -C build
 
+	# 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 || make docs
+
 	touch $@
 
 install: install-stamp
@@ -67,6 +80,10 @@ install-stamp: build-stamp
 	build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0-2/libexec/DumpRenderTree
 	build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(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/* \
+		debian/tmp/usr/share/doc/libwebkit-dev/html/
+
 	touch $@
 
 # Build architecture-independent files here.

-- 
WebKit Debian packaging