r1490 - in /experimental/evolution-data-server/debian: changelog libedata-cal1.2-7.install patches/66_fix-gtkdoc-call.patch

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Thu Jan 14 20:39:04 UTC 2010 

Author: corsac
Date: Thu Jan 14 20:39:03 2010
New Revision: 1490

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

Added:
    experimental/evolution-data-server/debian/patches/66_fix-gtkdoc-call.patch
Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/libedata-cal1.2-7.install

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1490&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Thu Jan 14 20:39:03 2010
@@ -3,8 +3,10 @@
   * New upstream development release.
   * debian/control:
     - rename package to libedata-cal-1.2-7 to match SONAME bump.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 11 Jan 2010 22:25:17 +0100
+  * debian/patches
+    - 66_fix-gtkdoc-call added, fix FTBFS with gtk-doc 1.13.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 14 Jan 2010 21:37:12 +0100
 
 evolution-data-server (2.29.3-1) experimental; urgency=low
 

Modified: experimental/evolution-data-server/debian/libedata-cal1.2-7.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedata-cal1.2-7.install?rev=1490&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedata-cal1.2-7.install (original)
+++ experimental/evolution-data-server/debian/libedata-cal1.2-7.install Thu Jan 14 20:39:03 2010
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/libedata-cal-1.2.so.*
-debian/lintian/libedata-cal1.2-6 usr/share/lintian/overrides/
+debian/lintian/libedata-cal1.2-7 usr/share/lintian/overrides/

Added: experimental/evolution-data-server/debian/patches/66_fix-gtkdoc-call.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/66_fix-gtkdoc-call.patch?rev=1490&op=file
==============================================================================
--- experimental/evolution-data-server/debian/patches/66_fix-gtkdoc-call.patch (added)
+++ experimental/evolution-data-server/debian/patches/66_fix-gtkdoc-call.patch Thu Jan 14 20:39:03 2010
@@ -1,0 +1,104 @@
+diff --git a/docs/reference/addressbook/libebook/Makefile.in b/docs/reference/addressbook/libebook/Makefile.in
+index 5b52f29..6ef9930 100644
+--- a/docs/reference/addressbook/libebook/Makefile.in
++++ b/docs/reference/addressbook/libebook/Makefile.in
+@@ -664,7 +664,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
+ 
+ ##############
+diff --git a/docs/reference/addressbook/libedata-book/Makefile.in b/docs/reference/addressbook/libedata-book/Makefile.in
+index a8d8654..aafb7af 100644
+--- a/docs/reference/addressbook/libedata-book/Makefile.in
++++ b/docs/reference/addressbook/libedata-book/Makefile.in
+@@ -664,7 +664,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
+ 
+ ##############
+diff --git a/docs/reference/calendar/libecal/Makefile.in b/docs/reference/calendar/libecal/Makefile.in
+index 6a12830..3ffa16a 100644
+--- a/docs/reference/calendar/libecal/Makefile.in
++++ b/docs/reference/calendar/libecal/Makefile.in
+@@ -665,7 +665,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
+ 
+ ##############
+diff --git a/docs/reference/calendar/libedata-cal/Makefile.in b/docs/reference/calendar/libedata-cal/Makefile.in
+index 8a0e6c1..0d00750 100644
+--- a/docs/reference/calendar/libedata-cal/Makefile.in
++++ b/docs/reference/calendar/libedata-cal/Makefile.in
+@@ -669,7 +669,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
+ 
+ ##############
+diff --git a/docs/reference/camel/Makefile.in b/docs/reference/camel/Makefile.in
+index 441d809..cf7d4d5 100644
+--- a/docs/reference/camel/Makefile.in
++++ b/docs/reference/camel/Makefile.in
+@@ -698,7 +698,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
+ 
+ ##############
+diff --git a/docs/reference/libebackend/Makefile.in b/docs/reference/libebackend/Makefile.in
+index dad0677..85751c4 100644
+--- a/docs/reference/libebackend/Makefile.in
++++ b/docs/reference/libebackend/Makefile.in
+@@ -658,7 +658,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
+ 
+ ##############
+diff --git a/docs/reference/libedataserver/Makefile.in b/docs/reference/libedataserver/Makefile.in
+index f755b2e..03e0a62 100644
+--- a/docs/reference/libedataserver/Makefile.in
++++ b/docs/reference/libedataserver/Makefile.in
+@@ -659,7 +659,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
+ 
+ ##############
+diff --git a/docs/reference/libedataserverui/Makefile.in b/docs/reference/libedataserverui/Makefile.in
+index ca077f7..9ee012c 100644
+--- a/docs/reference/libedataserverui/Makefile.in
++++ b/docs/reference/libedataserverui/Makefile.in
+@@ -664,7 +664,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
+ 
+ ##############

More information about the pkg-evolution-commits mailing list