[Pkg-ocaml-maint-commits] r2666 - in
/trunk/packages/ocamlgsl/trunk/debian: changelog control
patches/00list patches/cdf_handle_int_arguments.dpatch
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Thu May 4 20:44:02 UTC 2006
Author: smimram
Date: Thu May 4 20:44:00 2006
New Revision: 2666
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2666
Log:
NMU to solve the FTBFS.
Added:
trunk/packages/ocamlgsl/trunk/debian/patches/cdf_handle_int_arguments.dpatch (with props)
Modified:
trunk/packages/ocamlgsl/trunk/debian/changelog
trunk/packages/ocamlgsl/trunk/debian/control
trunk/packages/ocamlgsl/trunk/debian/patches/00list
Modified: trunk/packages/ocamlgsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/changelog?rev=2666&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgsl/trunk/debian/changelog Thu May 4 20:44:00 2006
@@ -1,3 +1,14 @@
+ocamlgsl (0.4.0-4.1) unstable; urgency=low
+
+ * NMU.
+ * Added a patch (cdf_handle_int_arguments.dpatch) to solve the FTBFS by
+ properly handling functions with "const unsigned int" arguments (thanks
+ Julien Cristau), closes: #361583.
+ * Added kfreebsd-amd64 to the list of supported archs, closes: #361635.
+ * Updated Standards-Version to 3.7.0, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org> Thu, 4 May 2006 20:31:48 +0000
+
ocamlgsl (0.4.0-4) unstable; urgency=low
* Rebuild for OCaml 3.09.1
Modified: trunk/packages/ocamlgsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/control?rev=2666&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control Thu May 4 20:44:00 2006
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
Build-Depends: ocaml-nox (>= 3.09.1), debhelper (>= 4), dpatch (>=1.11), ocaml-findlib, libgsl0-dev, chrpath, gawk
-Standards-Version: 3.6.2.0
+Standards-Version: 3.7.0
Package: libocamlgsl-ocaml-dev
Section: libdevel
-Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386
+Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${Source-Version}), libgsl0-dev
Description: GNU scientific library for OCaml
This is an interface to GSL (GNU scientific library), for the
@@ -18,7 +18,7 @@
Package: libocamlgsl-ocaml
Section: libs
-Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386
+Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
Description: GNU scientific library for OCaml
This is an interface to GSL (GNU scientific library), for the
Modified: trunk/packages/ocamlgsl/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/patches/00list?rev=2666&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlgsl/trunk/debian/patches/00list Thu May 4 20:44:00 2006
@@ -1,3 +1,3 @@
make_bytecode
02_correct_examples
-
+cdf_handle_int_arguments
Added: trunk/packages/ocamlgsl/trunk/debian/patches/cdf_handle_int_arguments.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/patches/cdf_handle_int_arguments.dpatch?rev=2666&op=file
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/patches/cdf_handle_int_arguments.dpatch (added)
+++ trunk/packages/ocamlgsl/trunk/debian/patches/cdf_handle_int_arguments.dpatch Thu May 4 20:44:00 2006
@@ -1,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cdf_handle_int_arguments.dpatch by <julien.cristau at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: gsl_cdf.h contains functions with const unsigned int arguments, so we
+## DP: can handle them as well as const double.
+
+ at DPATCH@
+
+--- ocamlgsl-0.4.0.orig/do_cdf.ml 2005-01-05 00:05:03.000000000 +0100
++++ ocamlgsl-0.4.0/do_cdf.ml 2006-04-21 03:00:13.000000000 +0200
+@@ -1,7 +1,10 @@
++type arg_type = Double of string | Int of string
+
+ let parse =
+ let regexp_full = Str.regexp "double gsl_cdf_\\([^ ]+\\) (\\([^)]+\\));" in
+- let regexp_arg = Str.regexp "const double \\([a-zA-Z0-9_]+\\)" in
++ let regexp_arg = Str.regexp "const" in
++ let regexp_double = Str.regexp "const double \\([a-zA-Z0-9_]+\\)" in
++ let regexp_uint = Str.regexp "const unsigned int \\([a-zA-z0-9_]+\\)" in
+ fun s ->
+ if Str.string_match regexp_full s 0
+ then
+@@ -11,8 +14,11 @@
+ let acc = ref [] in
+ let i = ref (Str.group_beginning 2) in
+ begin try while true do
+- let _ = Str.search_forward regexp_arg s !i in
+- acc := (Str.matched_group 1 s) :: !acc ;
++ let j = Str.search_forward regexp_arg s !i in
++ if Str.string_match regexp_double s j then
++ acc := (Double (Str.matched_group 1 s)) :: !acc
++ else if Str.string_match regexp_uint s j then
++ acc := (Int (Str.matched_group 1 s)) :: !acc;
+ i := Str.match_end ()
+ done
+ with Not_found -> () end ;
+@@ -26,14 +32,23 @@
+ | None -> ()
+ | Some v -> f v
+
++
++let trans_ml = function
++ Double s -> (String.lowercase s) ^ ":float"
++ | Int s -> (String.lowercase s) ^ ":int"
++
++let trans_c = function
++ Double _ -> print_string "Double_val, "
++ | Int _ -> print_string "Int_val, "
++
+ let print_ml (fun_name, args) =
+ Printf.printf "external %s : " fun_name ;
+- List.iter (fun arg -> Printf.printf "%s:float -> " (String.lowercase arg)) args ;
++ List.iter (fun arg -> Printf.printf "%s -> " (trans_ml arg)) args ;
+ Printf.printf "float = \"ml_gsl_cdf_%s\" \"gsl_cdf_%s\" \"float\"\n" fun_name fun_name
+
+ let print_c (fun_name, args) =
+ Printf.printf "ML%d(gsl_cdf_%s, " (List.length args) fun_name ;
+- List.iter (fun arg -> print_string "Double_val, ") args ;
++ List.iter trans_c args ;
+ print_string "copy_double)\n" ;
+ print_newline ()
+
Propchange: trunk/packages/ocamlgsl/trunk/debian/patches/cdf_handle_int_arguments.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-ocaml-maint-commits
mailing list