r1492 - in /experimental/evolution/debian: changelog patches/02_fix-gtkdoc.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Sat Jan 16 09:38:35 2010
New Revision: 1492

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1492
Log:
02_fix-gtkdoc added, fix FTBFS with gtk-doc 1.13.

Added:
    experimental/evolution/debian/patches/02_fix-gtkdoc.patch
Modified:
    experimental/evolution/debian/changelog

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1492&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Sat Jan 16 09:38:35 2010
@@ -9,9 +9,10 @@
     - drop build-dep on gnome-pilot.
   * debian/patches:
     - drop 02_fix-ftbfs-pilot_charset.
+    - 02_fix-gtkdoc added, fix FTBFS with gtk-doc 1.13.
   * drop gnome-pilot support.  * 
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 11 Jan 2010 21:52:15 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 14 Jan 2010 22:32:56 +0100
 
 evolution (2.29.3.2-1) experimental; urgency=low
 

Added: experimental/evolution/debian/patches/02_fix-gtkdoc.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/02_fix-gtkdoc.patch?rev=1492&op=file
==============================================================================
--- experimental/evolution/debian/patches/02_fix-gtkdoc.patch (added)
+++ experimental/evolution/debian/patches/02_fix-gtkdoc.patch Sat Jan 16 09:38:35 2010
@@ -1,0 +1,13 @@
+diff --git a/doc/reference/shell/Makefile.in b/doc/reference/shell/Makefile.in
+index 210bf27..74a4c9e 100644
+--- a/doc/reference/shell/Makefile.in
++++ b/doc/reference/shell/Makefile.in
+@@ -717,7 +717,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ 	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ 	@echo 'gtk-doc: Fixing cross-references'
+-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++	cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	touch html-build.stamp
+ 
+ ##############