[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-5-14-gfeaeecc

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 0013dc03b2e1c7546530adc3090f4179b28bda55
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Oct 7 09:14:47 2009 +0200

    fix some ocamldoc markup errors (overlooked thus far)
    
    new patch 0004-fix-syntax-errors-in-ocamldoc-tags

diff --git a/debian/changelog b/debian/changelog
index 72d6688..ba57059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,10 @@ galax (1.1-6) UNRELEASED; urgency=low
     - switch to dh_ocamldoc for API reference generation, stop relying on
       ocamldoc-api-ref-config, which is gone (Closes: #549850)
     - switch to dh 7
-  * debian/patches: port from dpatch to quilt (for dh 7 compatibility)
+  * debian/patches:
+    - port from dpatch to quilt (for dh 7 compatibility)
+    - new patch 0004-fix-syntax-errors-in-ocamldoc-tags: fix some ocamldoc
+      markup errors (overlooked thus far)
 
  -- Stefano Zacchiroli <zack at debian.org>  Tue, 06 Oct 2009 19:48:16 +0200
 
diff --git a/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch b/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch
new file mode 100644
index 0000000..a611475
--- /dev/null
+++ b/debian/patches/0004-fix-syntax-errors-in-ocamldoc-tags.patch
@@ -0,0 +1,45 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Wed, 7 Oct 2009 09:12:53 +0200
+Subject: [PATCH] fix syntax errors in ocamldoc @tags
+
+---
+ streaming/sax_annot.mli |    4 ++--
+ wsdl/wsdl_ast.mli       |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/streaming/sax_annot.mli b/streaming/sax_annot.mli
+index ec767a0..c71585c 100644
+--- a/streaming/sax_annot.mli
++++ b/streaming/sax_annot.mli
+@@ -44,7 +44,7 @@ val empty_sax_annot : unit -> sax_annot
+ val annot_components : sax_annot -> stream_label_annot option
+ 
+ (** Copy an annotation
+-    @param sax_annotation 
++    @param sax_annotation SAX annotation
+     @return copy of annotation *)
+ val copy_annot  : sax_annot -> sax_annot
+ 
+@@ -56,7 +56,7 @@ val copy_annot  : sax_annot -> sax_annot
+ val set_stream_label_annot  : sax_annot ->  stream_label_annot -> unit
+ 
+ (** Get the stream-label annotation
+-    @param sax_annotation 
++    @param sax_annotation SAX annotation
+     @return stream-label annotation
+    *)
+ val get_stream_label_annot  : sax_annot -> stream_label_annot
+diff --git a/wsdl/wsdl_ast.mli b/wsdl/wsdl_ast.mli
+index 088aef0..5f5c6f2 100644
+--- a/wsdl/wsdl_ast.mli
++++ b/wsdl/wsdl_ast.mli
+@@ -21,7 +21,7 @@
+ 
+   
+   @author Nicola Onose
+-  @see wsdl_load.mlp
++  @see 'wsdl_load.mlp' wsdl_load.mlp
+ 
+ *)
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 8ee46cb..ac44481 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-add-a-empty-BUGS-document-as-it-is-sourced-by-other-.patch
 0002-bump-expected-OCaml-version-to-3.11.patch
 0003-port-code-to-build-against-PXP-1.2.patch
+0004-fix-syntax-errors-in-ocamldoc-tags.patch

-- 
galax packaging