tags 544879 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for clutter (versioned as 0.8.8-2.1) and uploaded
it to DELAYED/2, according to devref §5.11.1. The -doc package FTBFS
with the error I've posted already to the bug log. The patch is
attached, it simply passes --module=... to gtkdoc-fixxref which was
missing before. Just note that I've fixed both gtk-doc.make (which is
the source of the error) *and* the generated Makefile.in that include
it, the reason is to avoid have to invoke automake during package build.
Cheers.
--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..| . |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u clutter-0.8.8/debian/changelog clutter-0.8.8/debian/changelog
--- clutter-0.8.8/debian/changelog
+++ clutter-0.8.8/debian/changelog
@@ -1,3 +1,13 @@
+clutter (0.8.8-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Sourceful rebuild, to resurrect the -doc package (Closes: #544879)
+ * gtk-doc.make (and generated Makefle.in friends): pass
+ --module=$(DOC_MODULE) to gtkdoc-fixxref to avoid bogus
+ "-sections.txt" files; fix FTBFS of the -doc package.
+
+ -- Stefano Zacchiroli <z...@debian.org> Mon, 18 Jan 2010 11:24:49 +0100
+
clutter (0.8.8-2) unstable; urgency=low
[ Loïc Minier ]
only in patch2:
unchanged:
--- clutter-0.8.8.orig/gtk-doc.make
+++ clutter-0.8.8/gtk-doc.make
@@ -119,7 +119,7 @@
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
##############
only in patch2:
unchanged:
--- clutter-0.8.8.orig/doc/reference/clutter/Makefile.in
+++ clutter-0.8.8/doc/reference/clutter/Makefile.in
@@ -628,7 +628,7 @@
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
##############
only in patch2:
unchanged:
--- clutter-0.8.8.orig/doc/reference/cogl/Makefile.in
+++ clutter-0.8.8/doc/reference/cogl/Makefile.in
@@ -588,7 +588,7 @@
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
##############
