Merge lp:~jconti/ubuntu/oneiric/webkit/fix_doc_path into lp:ubuntu/oneiric/webkit

[Jason Conti]

This branch updates the DOC_SOURCE_DIR in Source/WebKit/gtk/docs/GNUmakefile.{am,in} to match the absolute paths in precise so the documentation builds correctly in oneiric. It also includes a link from webkitgtk.devhelp2.gz to webkitgtk-3.0.devhelp2.gz in libwebkitgtk-3.0-dev so devhelp can find the documentation.

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[Ken VanDine (ken-vandine)]

I have uploaded this to oneiric-proposed and subscribed ubuntu-sru

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-29 14:54:29 +0000
+++ debian/changelog	2011-12-09 02:40:32 +0000
@@ -1,3 +1,12 @@
+webkit (1.4.3-0ubuntu4) oneiric; urgency=low
+
+  * debian/libwebkitgtk-3.0-dev.links:
+    - Link webkitgtk.devhelp2.gz to webkitgtk-3.0.devhelp2.gz
+  * debian/patches/11_fix_doc_path.patch:
+    - Use absolute path in makefile to fix out-of-tree build (LP: #900988)
+
+ -- Jason Conti <[e-mail]>  Wed, 07 Dec 2011 21:20:49 -0500
+
 webkit (1.4.3-0ubuntu3) oneiric; urgency=low
 
   * debian/patches/10_cherrypick_r95940.patch:

=== modified file 'debian/libwebkitgtk-3.0-dev.links'
--- debian/libwebkitgtk-3.0-dev.links	2011-01-13 10:37:55 +0000
+++ debian/libwebkitgtk-3.0-dev.links	2011-12-09 02:40:32 +0000
@@ -1,1 +1,2 @@
 usr/share/doc/libwebkitgtk-3.0-dev/html usr/share/gtk-doc/html/webkitgtk-3.0
+usr/share/doc/libwebkitgtk-3.0-dev/html/webkitgtk.devhelp2.gz usr/share/doc/libwebkitgtk-3.0-dev/html/webkitgtk-3.0.devhelp2.gz

=== added file 'debian/patches/11_fix_doc_path.patch'
--- debian/patches/11_fix_doc_path.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/11_fix_doc_path.patch	2011-12-09 02:40:32 +0000
@@ -0,0 +1,22 @@
+--- a/Source/WebKit/gtk/docs/GNUmakefile.am
++++ b/Source/WebKit/gtk/docs/GNUmakefile.am
+@@ -18,7 +18,7 @@
+ # gtk-doc will search all .c & .h files beneath here for inline comments
+ # documenting the functions and macros.
+ # e.g. DOC_SOURCE_DIR=../../../gtk
+-DOC_SOURCE_DIR=../webkit
++DOC_SOURCE_DIR=$(top_srcdir)/Source/WebKit/gtk/webkit
+ 
+ # Extra options to pass to gtkdoc-scangobj. Not normally needed.
+ SCANGOBJ_OPTIONS="--type-init-func=g_thread_init(NULL);g_type_init()"
+--- a/Source/WebKit/gtk/docs/GNUmakefile.in
++++ b/Source/WebKit/gtk/docs/GNUmakefile.in
+@@ -292,7 +292,7 @@
+ # gtk-doc will search all .c & .h files beneath here for inline comments
+ # documenting the functions and macros.
+ # e.g. DOC_SOURCE_DIR=../../../gtk
+-DOC_SOURCE_DIR = ../webkit
++DOC_SOURCE_DIR = $(top_srcdir)/Source/WebKit/gtk/webkit
+ 
+ # Extra options to pass to gtkdoc-scangobj. Not normally needed.
+ SCANGOBJ_OPTIONS = "--type-init-func=g_thread_init(NULL);g_type_init()"

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-29 14:54:29 +0000
+++ debian/patches/series	2011-12-09 02:40:32 +0000
@@ -1,2 +1,3 @@
 03_g_const_return.patch
 10_cherrypick_r95940.patch
+11_fix_doc_path.patch