[Pkg-ocaml-maint-commits] r5768 - /trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch

[toots at users.alioth.debian.org]

Author: toots
Date: Sun Jun 15 13:15:23 2008
New Revision: 5768

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5768
Log:
Changed fix for documentation parameter..

Modified:
    trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch

Modified: trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch?rev=5768&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch (original)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch Sun Jun 15 13:15:23 2008
@@ -1,53 +1,21 @@
-Index: liquidsoap-0.3.7/scripts/utils.liq
-===================================================================
---- liquidsoap-0.3.7.orig/scripts/utils.liq	2008-06-03 01:41:03.000000000 +0200
-+++ liquidsoap-0.3.7/scripts/utils.liq	2008-06-15 14:47:06.000000000 +0200
-@@ -15,8 +15,8 @@
- 
- # Alias for the <code>l[k]</code> notation.
- # @category List
--# @param a Key to look for
- # @param l List of pairs (key,value)
-+# @param a Key to look for
- def list.assoc(a,l)
-   l[a]
- end
-@@ -24,8 +24,8 @@
- # list.mem_assoc(key,l) returns true if l contains a pair
- # (key,value)
- # @category List
--# @param a Key to look for
- # @param l List of pairs (key,value)
-+# @param a Key to look for
- def list.mem_assoc(a,l)
-   v = list.assoc(a,l)
-   # We check for existence, since "" may indicate
-@@ -35,8 +35,8 @@
- 
- # Remove a pair from an associative list
- # @category List
--# @param a Key of pair to be removed
- # @param l List of pairs (key,value)
-+# @param a Key of pair to be removed
- def list.remove_assoc(a,l)
-   list.remove((a,list.assoc(a,l)),l)
- end
-@@ -125,15 +125,15 @@
- # Special track insensitive fallback that
- # always skip current song before switching.
- # @category Source / Track Processing
--# @param s The input source
-+# @param ~input The input source
- # @param f The fallback source
--def fallback.skip(s,f)
-+def fallback.skip(~input,f)
-   def transition(a,b) =
-     source.skip(a)
-     # This eats the last remaining frame from a
-     sequence([a,b])
-   end
--  fallback(track_sensitive=false,transitions=[transition,transition],[s,f])
-+  fallback(track_sensitive=false,transitions=[transition,transition],[input,f])
- end
- 
- # Compress and normalize, producing a more uniform and "full" sound.
+Index: trunk/liquidsoap/src/lang/lang_pp.ml
+===================================================================
+--- liquidsoap/src/lang/lang_pp.ml (revision 5147)
++++ liquidsoap/src/lang/lang_pp.ml (revision 5734)
+@@ -191,7 +191,5 @@
+ 
+ (* Glue the documenting comments to the corresponding PP_DEF (read pre-DEF)
+- * and strip out other comments.
+- * TODO: The parsing of comments is done at lexing, whether the comment is in
+- * documenting position or not. This could be enhanced. *)
++ * and strip out other comments. *)
+ 
+ let parse_comments tokenizer =
+@@ -232,5 +230,6 @@
+         doc
+     in
+-    let main = String.concat "\n" (List.rev main) in
++    let main = List.rev main and params = List.rev params in
++    let main = String.concat "\n" main in
+     let doc =
+       let sort = false in