[Pkg-ocaml-maint-commits] r5684 - in /trunk/packages/cameleon/trunk/debian: changelog patches/00list patches/no_internal_mli.dpatch

[gildor at users.alioth.debian.org]

Author: gildor
Date: Sat May 24 12:34:35 2008
New Revision: 5684

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5684
Log:
* Fix FTBFS by filtering internal mli file

Added:
    trunk/packages/cameleon/trunk/debian/patches/no_internal_mli.dpatch   (with props)
Modified:
    trunk/packages/cameleon/trunk/debian/changelog
    trunk/packages/cameleon/trunk/debian/patches/00list

Modified: trunk/packages/cameleon/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/changelog?rev=5684&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/changelog (original)
+++ trunk/packages/cameleon/trunk/debian/changelog Sat May 24 12:34:35 2008
@@ -1,18 +1,14 @@
-cameleon (1.9.18.svn20070918-2) UNRELEASED; urgency=low
+cameleon (1.9.18.svn20070918-2) unstable; urgency=low
 
   [ Sylvain Le Gall ]
-  * NOT RELEASED YET
+  * Filter out internal mli file when generating doc. (Closes: #482621)
+  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
 
   [ Stefano Zacchiroli ]
   * promote Homepage to a real debian/control field
-
-  [ Sylvain Le Gall ]
-  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
-
-  [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 18 Oct 2007 01:07:58 +0200
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 24 May 2008 12:09:11 +0200
 
 cameleon (1.9.18.svn20070918-1) unstable; urgency=low
 

Modified: trunk/packages/cameleon/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/patches/00list?rev=5684&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/00list (original)
+++ trunk/packages/cameleon/trunk/debian/patches/00list Sat May 24 12:34:35 2008
@@ -2,3 +2,4 @@
 ocamldoc_best
 languagesspecsdir
 tdl_filter_precious
+no_internal_mli

Added: trunk/packages/cameleon/trunk/debian/patches/no_internal_mli.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/patches/no_internal_mli.dpatch?rev=5684&op=file
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/no_internal_mli.dpatch (added)
+++ trunk/packages/cameleon/trunk/debian/patches/no_internal_mli.dpatch Sat May 24 12:34:35 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_internal_mli.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't try to extract documentation from internal header files.
+
+ at DPATCH@
+diff -urNad trunk~/doc/Makefile trunk/doc/Makefile
+--- trunk~/doc/Makefile	2008-05-24 13:04:41.000000000 +0200
++++ trunk/doc/Makefile	2008-05-24 13:05:03.000000000 +0200
+@@ -33,7 +33,7 @@
+ doc_stdlib:dummy
+ 	$(OCAMLDOC) -I +threads \
+ 	-dump $(STDLIB_DOC) \
+-	`ls $(OCAMLLIB)/*.mli | grep -v outcometree`
++	`ls $(OCAMLLIB)/*.mli | grep -v -E "(outcometree|genprintval|topdirs|toploop|trace)"`
+ 
+ CAMELEON_DOC=cameleon.odoc
+ doc_cameleon:dummy

Propchange: trunk/packages/cameleon/trunk/debian/patches/no_internal_mli.dpatch
------------------------------------------------------------------------------
    svn:executable = *