From: Stephane Glondu Date: Sat, 29 Nov 2008 10:42:08 +0000 (+0100) Subject: Update patches X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~449^2~25 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8d8ead976dbe408a73fe5172b75ac6cbb33bbd7c;p=ocaml.git Update patches --- diff --git a/debian/patches/00list b/debian/patches/00list index fcf35f8e..094fc1f4 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,5 +1,3 @@ -manpages.dpatch -ocamldoc.dpatch objinfo.dpatch dumpobj.dpatch man-ocamlmklib.dpatch diff --git a/debian/patches/alpha_ld_no-relax.dpatch b/debian/patches/alpha_ld_no-relax.dpatch index 888a89d6..9b47c685 100755 --- a/debian/patches/alpha_ld_no-relax.dpatch +++ b/debian/patches/alpha_ld_no-relax.dpatch @@ -8,9 +8,9 @@ @DPATCH@ diff -urNad ocaml~/configure ocaml/configure ---- ocaml~/configure 2008-10-17 12:22:50.000000000 +0200 -+++ ocaml/configure 2008-10-20 14:34:59.000000000 +0200 -@@ -280,7 +280,8 @@ +--- ocaml~/configure 2008-11-29 11:16:39.000000000 +0100 ++++ ocaml/configure 2008-11-29 11:31:37.000000000 +0100 +@@ -282,7 +282,8 @@ gcc,alpha*-*-linux*) if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; @@ -26,5 +26,5 @@ diff -urNad ocaml~/configure ocaml/configure if $arch64; then partialld="ld -r -arch ppc64"; fi;; + alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax";; *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; + amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; *,gcc*,*,*) nativecccompopts="$gcc_warnings";; - esac diff --git a/debian/patches/call_ld_with_proper_flags.dpatch b/debian/patches/call_ld_with_proper_flags.dpatch index fa64e2cd..4151fe2e 100755 --- a/debian/patches/call_ld_with_proper_flags.dpatch +++ b/debian/patches/call_ld_with_proper_flags.dpatch @@ -8,9 +8,9 @@ @DPATCH@ diff -urNad ocaml~/configure ocaml/configure ---- ocaml~/configure 2008-10-20 14:54:55.000000000 +0200 -+++ ocaml/configure 2008-10-20 14:56:17.000000000 +0200 -@@ -1544,7 +1544,8 @@ +--- ocaml~/configure 2008-11-29 11:31:44.000000000 +0100 ++++ ocaml/configure 2008-11-29 11:31:48.000000000 +0100 +@@ -1548,7 +1548,8 @@ echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile diff --git a/debian/patches/dumpobj.dpatch b/debian/patches/dumpobj.dpatch index f71f9744..05a9266f 100755 --- a/debian/patches/dumpobj.dpatch +++ b/debian/patches/dumpobj.dpatch @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad ocaml~/man/ocamlc.m ocaml/man/ocamlc.m ---- ocaml~/man/ocamlc.m 2008-10-20 14:29:27.000000000 +0200 -+++ ocaml/man/ocamlc.m 2008-10-20 14:31:41.000000000 +0200 +--- ocaml~/man/ocamlc.m 2008-11-29 11:31:16.000000000 +0100 ++++ ocaml/man/ocamlc.m 2008-11-29 11:31:16.000000000 +0100 @@ -579,7 +579,8 @@ Display a short usage summary and exit. @@ -20,7 +20,7 @@ diff -urNad ocaml~/man/ocamlc.m ocaml/man/ocamlc.m chapter "Batch compilation". diff -urNad ocaml~/man/ocamldumpobj.m ocaml/man/ocamldumpobj.m --- ocaml~/man/ocamldumpobj.m 1970-01-01 01:00:00.000000000 +0100 -+++ ocaml/man/ocamldumpobj.m 2008-10-20 14:29:28.000000000 +0200 ++++ ocaml/man/ocamldumpobj.m 2008-11-29 11:31:16.000000000 +0100 @@ -0,0 +1,20 @@ +.TH OCAMLDUMPOBJ 1 "January 4, 2006" +.SH NAME @@ -43,8 +43,8 @@ diff -urNad ocaml~/man/ocamldumpobj.m ocaml/man/ocamldumpobj.m +This manual page was written by Samuel Mimram , +for the Debian GNU/Linux system (but may be used by others). diff -urNad ocaml~/man/ocamlopt.m ocaml/man/ocamlopt.m ---- ocaml~/man/ocamlopt.m 2008-10-20 14:29:27.000000000 +0200 -+++ ocaml/man/ocamlopt.m 2008-10-20 14:29:28.000000000 +0200 +--- ocaml~/man/ocamlopt.m 2008-11-29 11:31:16.000000000 +0100 ++++ ocaml/man/ocamlopt.m 2008-11-29 11:31:16.000000000 +0100 @@ -604,7 +604,8 @@ .SH SEE ALSO @@ -56,8 +56,8 @@ diff -urNad ocaml~/man/ocamlopt.m ocaml/man/ocamlopt.m .IR "The Objective Caml user's manual" , chapter "Native-code compilation". diff -urNad ocaml~/tools/Makefile.shared ocaml/tools/Makefile.shared ---- ocaml~/tools/Makefile.shared 2008-10-20 14:29:27.000000000 +0200 -+++ ocaml/tools/Makefile.shared 2008-10-20 14:30:25.000000000 +0200 +--- ocaml~/tools/Makefile.shared 2008-11-29 11:31:16.000000000 +0100 ++++ ocaml/tools/Makefile.shared 2008-11-29 11:31:16.000000000 +0100 @@ -73,6 +73,7 @@ cp ocamlcp $(BINDIR)/ocamlcp$(EXE) cp profiling.cmi profiling.cmo $(LIBDIR) diff --git a/debian/patches/for_pack_static.dpatch b/debian/patches/for_pack_static.dpatch deleted file mode 100755 index 8294df2a..00000000 --- a/debian/patches/for_pack_static.dpatch +++ /dev/null @@ -1,407 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## for_pack_static.dpatch by Alain Frisch and Xavier Leroy -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Correct interaction between -for-pack and static approximations. -## DP: See http://caml.inria.fr/mantis/view.php?id=3825. - -@DPATCH@ -diff -urNad ocaml-3.09.0~/asmcomp/closure.ml ocaml-3.09.0/asmcomp/closure.ml ---- ocaml-3.09.0~/asmcomp/closure.ml 2005-12-11 19:33:52.000000000 +0100 -+++ ocaml-3.09.0/asmcomp/closure.ml 2005-12-11 19:34:29.000000000 +0100 -@@ -10,7 +10,7 @@ - (* *) - (***********************************************************************) - --(* $Id: closure.ml,v 1.48 2005/10/24 09:05:27 xleroy Exp $ *) -+(* $Id: closure.ml,v 1.48.2.2 2005/12/11 10:21:12 xleroy Exp $ *) - - (* Introduction of closures, uncurrying, recognition of direct calls *) - -@@ -33,9 +33,18 @@ - let rec build_closure_env env_param pos = function - [] -> Tbl.empty - | id :: rem -> -- Tbl.add id (Uprim(Pfield pos, [Uvar env_param])) -+ Tbl.add id (Uprim(Pfield pos, [Uvar env_param])) - (build_closure_env env_param (pos+1) rem) - -+(* Auxiliary for accessing globals. We change the name of the global -+ to the name of the corresponding asm symbol. This is done here -+ and no longer in Cmmgen so that approximations stored in .cmx files -+ contain the right names if the -for-pack option is active. *) -+ -+let getglobal id = -+ Uprim(Pgetglobal (Ident.create_persistent (Compilenv.symbol_for_global id)), -+ []) -+ - (* Check if a variable occurs in a [clambda] term. *) - - let occurs_var var u = -@@ -62,7 +71,7 @@ - | Uwhile(cond, body) -> occurs cond || occurs body - | Ufor(id, lo, hi, dir, body) -> occurs lo || occurs hi || occurs body - | Uassign(id, u) -> id = var || occurs u -- | Usend(_, met, obj, args) -> -+ | Usend(_, met, obj, args) -> - occurs met || occurs obj || List.exists occurs args - and occurs_array a = - try -@@ -103,7 +112,7 @@ - | _ -> 2 (* arithmetic and comparisons *) - - (* Very raw approximation of switch cost *) -- -+ - let lambda_smaller lam threshold = - let size = ref 0 in - let rec lambda_size lam = -@@ -276,7 +285,7 @@ - let bindings1 = - List.map (fun (id, rhs) -> (id, Ident.rename id, rhs)) bindings in - let sb' = -- List.fold_right -+ List.fold_right - (fun (id, id', _) s -> Tbl.add id (Uvar id') s) - bindings1 sb in - Uletrec( -@@ -529,7 +538,8 @@ - end - | Lprim(Pgetglobal id, []) as lam -> - check_constant_result lam -- (Uprim(Pgetglobal id, [])) (Compilenv.global_approx id) -+ (getglobal id) -+ (Compilenv.global_approx id) - | Lprim(Pmakeblock(tag, mut) as prim, lams) -> - let (ulams, approxs) = List.split (List.map (close fenv cenv) lams) in - (Uprim(prim, ulams), -@@ -547,7 +557,7 @@ - | Lprim(Psetfield(n, _), [Lprim(Pgetglobal id, []); lam]) -> - let (ulam, approx) = close fenv cenv lam in - (!global_approx).(n) <- approx; -- (Uprim(Psetfield(n, false), [Uprim(Pgetglobal id, []); ulam]), -+ (Uprim(Psetfield(n, false), [getglobal id; ulam]), - Value_unknown) - | Lprim(p, args) -> - simplif_prim p (close_list_approx fenv cenv args) -@@ -558,7 +568,7 @@ - close_switch fenv cenv sw.sw_consts sw.sw_numconsts sw.sw_failaction - and block_index, block_actions = - close_switch fenv cenv sw.sw_blocks sw.sw_numblocks sw.sw_failaction in -- (Uswitch(uarg, -+ (Uswitch(uarg, - {us_index_consts = const_index; - us_actions_consts = const_actions; - us_index_blocks = block_index; -@@ -579,7 +589,7 @@ - (uarg, Value_constptr n) -> - sequence_constant_expr arg uarg - (close fenv cenv (if n = 0 then ifnot else ifso)) -- | (uarg, _ ) -> -+ | (uarg, _ ) -> - let (uifso, _) = close fenv cenv ifso in - let (uifnot, _) = close fenv cenv ifnot in - (Uifthenelse(uarg, uifso, uifnot), Value_unknown) -diff -urNad ocaml-3.09.0~/asmcomp/cmmgen.ml ocaml-3.09.0/asmcomp/cmmgen.ml ---- ocaml-3.09.0~/asmcomp/cmmgen.ml 2005-08-01 17:51:09.000000000 +0200 -+++ ocaml-3.09.0/asmcomp/cmmgen.ml 2005-12-11 19:37:05.000000000 +0100 -@@ -10,7 +10,7 @@ - (* *) - (***********************************************************************) - --(* $Id: cmmgen.ml,v 1.103 2005/08/01 15:51:09 xleroy Exp $ *) -+(* $Id: cmmgen.ml,v 1.103.2.2 2005/12/11 10:21:12 xleroy Exp $ *) - - (* Translation from closed lambda to C-- *) - -@@ -27,7 +27,7 @@ - - let bind name arg fn = - match arg with -- Cvar _ | Cconst_int _ | Cconst_natint _ | Cconst_symbol _ -+ Cvar _ | Cconst_int _ | Cconst_natint _ | Cconst_symbol _ - | Cconst_pointer _ | Cconst_natpointer _ -> fn arg - | _ -> let id = Ident.create name in Clet(id, arg, fn (Cvar id)) - -@@ -343,7 +343,7 @@ - [] -> Cvar id - | e1::el -> Csequence(set_fn (Cvar id) (Cconst_int idx) e1, - fill_fields (idx + 2) el) in -- Clet(id, -+ Clet(id, - Cop(Cextcall("caml_alloc", typ_addr, true), - [Cconst_int wordsize; Cconst_int tag]), - fill_fields 1 args) -@@ -423,7 +423,7 @@ - int_const n - | Const_base(Const_char c) -> - Cconst_int(((Char.code c) lsl 1) + 1) -- | Const_pointer n -> -+ | Const_pointer n -> - if n <= max_repr_int && n >= min_repr_int - then Cconst_pointer((n lsl 1) + 1) - else Cconst_natpointer -@@ -477,7 +477,7 @@ - when bi = Pint32 && size_int = 8 && not big_endian -> - (* Force sign-extension of low 32 bits *) - Cop(Casr, [Cop(Clsl, [contents; Cconst_int 32]); Cconst_int 32]) -- | Cop(Calloc, [hdr; ops; contents]) -> -+ | Cop(Calloc, [hdr; ops; contents]) -> - contents - | _ -> - Cop(Cload(if bi = Pint32 then Thirtytwo_signed else Word), -@@ -645,7 +645,7 @@ - let lcases = Array.length cases in - let new_cases = Array.create lcases 0 in - let store = Switch.mk_store (=) in -- -+ - for i = 0 to Array.length cases-1 do - let act = cases.(i) in - let new_act = store.Switch.act_store act in -@@ -741,7 +741,7 @@ - Cvar id as e -> - if Ident.same id boxed_id then need_boxed := true; e - | Clet(id, arg, body) -> Clet(id, subst arg, subst body) -- | Cassign(id, arg) -> -+ | Cassign(id, arg) -> - if Ident.same id boxed_id then begin - assigned := true; - Cassign(unboxed_id, subst(unbox_fn arg)) -@@ -759,11 +759,11 @@ - Cswitch(subst arg, index, Array.map subst cases) - | Cloop e -> Cloop(subst e) - | Ccatch(nfail, ids, e1, e2) -> Ccatch(nfail, ids, subst e1, subst e2) -- | Cexit (nfail, el) -> Cexit (nfail, List.map subst el) -+ | Cexit (nfail, el) -> Cexit (nfail, List.map subst el) - | Ctrywith(e1, id, e2) -> Ctrywith(subst e1, id, subst e2) - | e -> e in - let res = subst exp in -- (res, !need_boxed, !assigned) -+ (res, !need_boxed, !assigned) - - (* Translate an expression *) - -@@ -820,20 +820,20 @@ - Cop(Capply typ_addr, cargs) - | Usend(kind, met, obj, args) -> - let call_met obj args clos = -- if args = [] then Cop(Capply typ_addr,[get_field clos 0;obj;clos]) else -- let arity = List.length args + 1 in -+ if args = [] then Cop(Capply typ_addr,[get_field clos 0;obj;clos]) else -+ let arity = List.length args + 1 in - let cargs = Cconst_symbol(apply_function arity) :: obj :: -- (List.map transl args) @ [clos] in -+ (List.map transl args) @ [clos] in - Cop(Capply typ_addr, cargs) - in - bind "obj" (transl obj) (fun obj -> -- match kind, args with -- Self, _ -> -+ match kind, args with -+ Self, _ -> - bind "met" (lookup_label obj (transl met)) (call_met obj args) -- | Cached, cache :: pos :: args -> -+ | Cached, cache :: pos :: args -> - call_cached_method obj (transl met) (transl cache) (transl pos) - (List.map transl args) -- | _ -> -+ | _ -> - bind "met" (lookup_tag obj (transl met)) (call_met obj args)) - | Ulet(id, exp, body) -> - begin match is_unboxed_number exp with -@@ -853,7 +853,7 @@ - | Uprim(prim, args) -> - begin match (simplif_primitive prim, args) with - (Pgetglobal id, []) -> -- Cconst_symbol (Compilenv.symbol_for_global id) -+ Cconst_symbol (Ident.name id) - | (Pmakeblock(tag, mut), []) -> - transl_constant(Const_block(tag, [])) - | (Pmakeblock(tag, mut), args) -> -@@ -961,7 +961,7 @@ - (exit_if_false cond (transl ifso) raise_num) - (transl ifnot) - | Uifthenelse(Uprim(Psequor, _) as cond, ifso, ifnot) -> -- let raise_num = next_raise_count () in -+ let raise_num = next_raise_count () in - make_catch - raise_num - (exit_if_true cond raise_num (transl ifnot)) -@@ -1007,7 +1007,7 @@ - (remove_unit(transl body), - Clet(id_prev, Cvar id, - Csequence -- (Cassign(id, -+ (Cassign(id, - Cop(inc, [Cvar id; Cconst_int 2])), - Cifthenelse - (Cop(Ccmpi Ceq, [Cvar id_prev; high]), -@@ -1152,7 +1152,7 @@ - | Pintcomp cmp -> - tag_int(Cop(Ccmpi(transl_comparison cmp), [transl arg1; transl arg2])) - | Pisout -> -- transl_isout (transl arg1) (transl arg2) -+ transl_isout (transl arg1) (transl arg2) - (* Float operations *) - | Paddfloat -> - box_float(Cop(Caddf, -@@ -1216,7 +1216,7 @@ - box_float( - bind "index" (transl arg2) (fun idx -> - bind "arr" (transl arg1) (fun arr -> -- Csequence(Cop(Ccheckbound, -+ Csequence(Cop(Ccheckbound, - [float_array_length(header arr); idx]), - unboxed_float_array_ref arr idx)))) - end -@@ -1239,7 +1239,7 @@ - box_int bi (Cop(Csubi, - [transl_unbox_int bi arg1; transl_unbox_int bi arg2])) - | Pmulbint bi -> -- box_int bi (Cop(Cmuli, -+ box_int bi (Cop(Cmuli, - [transl_unbox_int bi arg1; transl_unbox_int bi arg2])) - | Pdivbint bi -> - box_int bi (safe_divmod Cdivi -@@ -1366,7 +1366,7 @@ - - and make_catch ncatch body handler = match body with - | Cexit (nexit,[]) when nexit=ncatch -> handler --| _ -> Ccatch (ncatch, [], body, handler) -+| _ -> Ccatch (ncatch, [], body, handler) - - and make_catch2 mk_body handler = match handler with - | Cexit (_,[])|Ctuple []|Cconst_int _|Cconst_pointer _ -> -@@ -1377,7 +1377,7 @@ - nfail - (mk_body (Cexit (nfail,[]))) - handler -- -+ - and exit_if_true cond nfail otherwise = - match cond with - | Uconst (Const_pointer 0) -> otherwise -@@ -1387,14 +1387,14 @@ - | Uprim(Psequand, _) -> - begin match otherwise with - | Cexit (raise_num,[]) -> -- exit_if_false cond (Cexit (nfail,[])) raise_num -+ exit_if_false cond (Cexit (nfail,[])) raise_num - | _ -> - let raise_num = next_raise_count () in - make_catch - raise_num - (exit_if_false cond (Cexit (nfail,[])) raise_num) - otherwise -- end -+ end - | Uprim(Pnot, [arg]) -> - exit_if_false arg otherwise nfail - | Uifthenelse (cond, ifso, ifnot) -> -@@ -1444,7 +1444,7 @@ - | _ -> - let n_index = Array.length index in - let actions = Array.map transl cases in -- -+ - let inters = ref [] - and this_high = ref (n_index-1) - and this_low = ref (n_index-1) -@@ -1576,17 +1576,17 @@ - | Const_base(Const_string s) -> - let lbl = new_const_label() in - (Clabel_address lbl, -- Cint(string_header (String.length s)) :: Cdefine_label lbl :: -+ Cint(string_header (String.length s)) :: Cdefine_label lbl :: - emit_string_constant s cont) - | Const_immstring s -> - begin try -- (Clabel_address (Hashtbl.find immstrings s), cont) -+ (Clabel_address (Hashtbl.find immstrings s), cont) - with Not_found -> -- let lbl = new_const_label() in -- Hashtbl.add immstrings s lbl; -- (Clabel_address lbl, -- Cint(string_header (String.length s)) :: Cdefine_label lbl :: -- emit_string_constant s cont) -+ let lbl = new_const_label() in -+ Hashtbl.add immstrings s lbl; -+ (Clabel_address lbl, -+ Cint(string_header (String.length s)) :: Cdefine_label lbl :: -+ emit_string_constant s cont) - end - | Const_base(Const_int32 n) -> - let lbl = new_const_label() in -@@ -1733,22 +1733,22 @@ - (raise_num, [], - Cloop - (Clet( -- mi, -- Cop(Cor, -- [Cop(Clsr, [Cop(Caddi, [Cvar li; Cvar hi]); Cconst_int 1]); -- Cconst_int 1]), -- Csequence( -- Cifthenelse -- (Cop (Ccmpi Clt, -- [tag; -- Cop(Cload Word, -- [Cop(Cadda, -- [meths; lsl_const (Cvar mi) log2_size_addr])])]), -- Cassign(hi, Cop(Csubi, [Cvar mi; Cconst_int 2])), -- Cassign(li, Cvar mi)), -- Cifthenelse -- (Cop(Ccmpi Cge, [Cvar li; Cvar hi]), Cexit (raise_num, []), -- Ctuple [])))), -+ mi, -+ Cop(Cor, -+ [Cop(Clsr, [Cop(Caddi, [Cvar li; Cvar hi]); Cconst_int 1]); -+ Cconst_int 1]), -+ Csequence( -+ Cifthenelse -+ (Cop (Ccmpi Clt, -+ [tag; -+ Cop(Cload Word, -+ [Cop(Cadda, -+ [meths; lsl_const (Cvar mi) log2_size_addr])])]), -+ Cassign(hi, Cop(Csubi, [Cvar mi; Cconst_int 2])), -+ Cassign(li, Cvar mi)), -+ Cifthenelse -+ (Cop(Ccmpi Cge, [Cvar li; Cvar hi]), Cexit (raise_num, []), -+ Ctuple [])))), - Ctuple []), - Clet ( - tagged, Cop(Cadda, [lsl_const (Cvar li) log2_size_addr; -@@ -1811,13 +1811,13 @@ - Clet ( - cached, Cop(Cand, [Cop(Cload Word, [cache]); mask]), - Clet ( -- real, -+ real, - Cifthenelse(Cop(Ccmpa Cne, [tag'; tag]), -- cache_public_method (Cvar meths) tag cache, -+ cache_public_method (Cvar meths) tag cache, - cached_pos), - Cop(Cload Word, [Cop(Cadda, [Cop (Cadda, [Cvar real; Cvar meths]); - Cconst_int(2*size_addr-1)])])))) -- -+ - in - let body = Clet(clos', clos, body) in - let fun_args = -@@ -1904,13 +1904,13 @@ - {fun_name = name2; - fun_args = [arg, typ_addr; clos, typ_addr]; - fun_body = Cop(Calloc, -- [alloc_closure_header 4; -+ [alloc_closure_header 4; - Cconst_symbol(name1 ^ "_" ^ string_of_int (num+1)); - int_const 1; Cvar arg; Cvar clos]); - fun_fast = true} - :: intermediate_curry_functions arity (num+1) - end -- -+ - let curry_function arity = - if arity >= 0 - then intermediate_curry_functions arity 0 diff --git a/debian/patches/install_ocamlbuild.dpatch b/debian/patches/install_ocamlbuild.dpatch index 9d02c2a9..d95ddda6 100755 --- a/debian/patches/install_ocamlbuild.dpatch +++ b/debian/patches/install_ocamlbuild.dpatch @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad ocaml~/build/partial-install.sh ocaml/build/partial-install.sh ---- ocaml~/build/partial-install.sh 2008-10-20 15:01:52.000000000 +0200 -+++ ocaml/build/partial-install.sh 2008-10-20 15:01:52.000000000 +0200 +--- ocaml~/build/partial-install.sh 2008-11-29 11:32:25.000000000 +0100 ++++ ocaml/build/partial-install.sh 2008-11-29 11:32:25.000000000 +0100 @@ -60,6 +60,21 @@ [ -x "$3" ] || chmod +x "$3" } diff --git a/debian/patches/install_scripts_config.dpatch b/debian/patches/install_scripts_config.dpatch index 88bb6010..626b5f88 100755 --- a/debian/patches/install_scripts_config.dpatch +++ b/debian/patches/install_scripts_config.dpatch @@ -7,8 +7,8 @@ @DPATCH@ diff -urNad ocaml~/build/install.sh ocaml/build/install.sh ---- ocaml~/build/install.sh 2008-10-17 12:22:50.000000000 +0200 -+++ ocaml/build/install.sh 2008-10-20 15:01:11.000000000 +0200 +--- ocaml~/build/install.sh 2008-08-05 15:05:23.000000000 +0200 ++++ ocaml/build/install.sh 2008-11-29 11:32:20.000000000 +0100 @@ -18,7 +18,7 @@ cd `dirname $0`/.. @@ -19,8 +19,8 @@ diff -urNad ocaml~/build/install.sh ocaml/build/install.sh not_installed=$PWD/_build/not_installed diff -urNad ocaml~/build/partial-install.sh ocaml/build/partial-install.sh ---- ocaml~/build/partial-install.sh 2008-10-17 12:22:50.000000000 +0200 -+++ ocaml/build/partial-install.sh 2008-10-20 15:01:11.000000000 +0200 +--- ocaml~/build/partial-install.sh 2008-01-11 17:13:16.000000000 +0100 ++++ ocaml/build/partial-install.sh 2008-11-29 11:32:20.000000000 +0100 @@ -22,7 +22,7 @@ cd `dirname $0`/.. diff --git a/debian/patches/man-ocamlmklib.dpatch b/debian/patches/man-ocamlmklib.dpatch index 736dcae9..3e6704c3 100755 --- a/debian/patches/man-ocamlmklib.dpatch +++ b/debian/patches/man-ocamlmklib.dpatch @@ -20,7 +20,7 @@ exit 0 @DPATCH@ diff -urNad ocaml~/man/ocamlmklib.m ocaml/man/ocamlmklib.m --- ocaml~/man/ocamlmklib.m 1970-01-01 01:00:00.000000000 +0100 -+++ ocaml/man/ocamlmklib.m 2008-10-20 14:34:05.000000000 +0200 ++++ ocaml/man/ocamlmklib.m 2008-11-29 11:31:28.000000000 +0100 @@ -0,0 +1,127 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH OCAMLMKLIB 1 "August 19, 2004" diff --git a/debian/patches/manpages.dpatch b/debian/patches/manpages.dpatch deleted file mode 100755 index 12873fc2..00000000 --- a/debian/patches/manpages.dpatch +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## manpages.dpatch by Stephane Glondu -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix errors in ocamlc and ocamlopt manpages (see Mantis #4629) - - -@DPATCH@ -diff --git a/man/ocamlc.m b/man/ocamlc.m -index 0ce1e8d..b1fb8bf 100644 ---- a/man/ocamlc.m -+++ b/man/ocamlc.m -@@ -421,8 +421,8 @@ as a preprocessor for each source file. The output of - is redirected to - an intermediate file, which is compiled. If there are no compilation - errors, the intermediate file is deleted afterwards. The name of this --file is built from the basename of the source file with the extension --.ppi for an interface (.mli) file and .ppo for an implementation -+file is built from the basename of the source file with the extension .ppi -+for an interface (.mli) file and .ppo for an implementation - (.ml) file. - .TP - .B \-principal -@@ -561,7 +561,7 @@ into errors. The compiler will stop with an error when one of these - warnings is emitted. The - .I warning\-list - has the same meaning as for --the "-w" option: an uppercase character turns the corresponding -+the "\-w" option: an uppercase character turns the corresponding - warning into an error, a lowercase character leaves it as a warning. - The default setting is - .B \-warn\-error\ a -diff --git a/man/ocamlopt.m b/man/ocamlopt.m -index 3872bd8..2a44836 100644 ---- a/man/ocamlopt.m -+++ b/man/ocamlopt.m -@@ -222,7 +222,7 @@ and edit that file to remove all declarations of unexported names. - Add the given directory to the list of directories searched for - compiled interface files (.cmi) and compiled object code files - (.cmo). By default, the current directory is searched first, then the --standard library directory. Directories added with -I are searched -+standard library directory. Directories added with \-I are searched - after the current directory, in the order in which they were given on - the command line, but before the standard library directory. - -@@ -536,7 +536,7 @@ into errors. The compiler will stop with an error when one of these - warnings is emitted. The - .I warning\-list - has the same meaning as for --the "-w" option: an uppercase character turns the corresponding -+the "\-w" option: an uppercase character turns the corresponding - warning into an error, a lowercase character leaves it as a warning. - The default setting is - .B \-warn\-error\ a -@@ -577,7 +577,7 @@ trigonometric operations - .BR cos , - .BR sin , - .B tan --have their range reduced to [-2^64, 2^64]. -+have their range reduced to [\-2^64, 2^64]. - - .SH OPTIONS FOR THE AMD64 ARCHITECTURE - diff --git a/debian/patches/no_rpath.dpatch b/debian/patches/no_rpath.dpatch index 54bba4df..3547e15d 100755 --- a/debian/patches/no_rpath.dpatch +++ b/debian/patches/no_rpath.dpatch @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad ocaml~/tools/ocamlmklib.mlp ocaml/tools/ocamlmklib.mlp ---- ocaml~/tools/ocamlmklib.mlp 2008-10-17 12:22:50.000000000 +0200 -+++ ocaml/tools/ocamlmklib.mlp 2008-10-20 14:58:29.000000000 +0200 +--- ocaml~/tools/ocamlmklib.mlp 2008-01-08 16:39:47.000000000 +0100 ++++ ocaml/tools/ocamlmklib.mlp 2008-11-29 11:31:52.000000000 +0100 @@ -32,6 +32,11 @@ and rpath = ref [] (* rpath options *) and verbose = ref false diff --git a/debian/patches/objinfo.dpatch b/debian/patches/objinfo.dpatch index 3fa80f96..c64bd776 100755 --- a/debian/patches/objinfo.dpatch +++ b/debian/patches/objinfo.dpatch @@ -19,8 +19,8 @@ esac exit 0 @DPATCH@ diff -urNad ocaml~/man/ocamlc.m ocaml/man/ocamlc.m ---- ocaml~/man/ocamlc.m 2008-10-18 11:11:39.000000000 +0200 -+++ ocaml/man/ocamlc.m 2008-10-20 14:26:37.000000000 +0200 +--- ocaml~/man/ocamlc.m 2008-11-29 11:16:39.000000000 +0100 ++++ ocaml/man/ocamlc.m 2008-11-29 11:31:06.000000000 +0100 @@ -579,7 +579,7 @@ Display a short usage summary and exit. @@ -32,7 +32,7 @@ diff -urNad ocaml~/man/ocamlc.m ocaml/man/ocamlc.m chapter "Batch compilation". diff -urNad ocaml~/man/ocamlobjinfo.m ocaml/man/ocamlobjinfo.m --- ocaml~/man/ocamlobjinfo.m 1970-01-01 01:00:00.000000000 +0100 -+++ ocaml/man/ocamlobjinfo.m 2008-10-20 14:26:37.000000000 +0200 ++++ ocaml/man/ocamlobjinfo.m 2008-11-29 11:31:10.000000000 +0100 @@ -0,0 +1,40 @@ +.TH OCAML-SOAP 1 "October 26, 2002" +.SH NAME @@ -75,8 +75,8 @@ diff -urNad ocaml~/man/ocamlobjinfo.m ocaml/man/ocamlobjinfo.m +This manual page was written by Stefano Zacchiroli , +for the Debian GNU/Linux system (but may be used by others). diff -urNad ocaml~/man/ocamlopt.m ocaml/man/ocamlopt.m ---- ocaml~/man/ocamlopt.m 2008-10-18 11:11:39.000000000 +0200 -+++ ocaml/man/ocamlopt.m 2008-10-20 14:26:37.000000000 +0200 +--- ocaml~/man/ocamlopt.m 2008-11-29 11:16:39.000000000 +0100 ++++ ocaml/man/ocamlopt.m 2008-11-29 11:31:10.000000000 +0100 @@ -603,7 +603,8 @@ SPARC processors. @@ -88,8 +88,8 @@ diff -urNad ocaml~/man/ocamlopt.m ocaml/man/ocamlopt.m .IR "The Objective Caml user's manual" , chapter "Native-code compilation". diff -urNad ocaml~/tools/Makefile.shared ocaml/tools/Makefile.shared ---- ocaml~/tools/Makefile.shared 2008-10-17 12:22:50.000000000 +0200 -+++ ocaml/tools/Makefile.shared 2008-10-20 14:26:37.000000000 +0200 +--- ocaml~/tools/Makefile.shared 2007-11-22 23:14:43.000000000 +0100 ++++ ocaml/tools/Makefile.shared 2008-11-29 11:31:10.000000000 +0100 @@ -24,7 +24,7 @@ LINKFLAGS=$(INCLUDES) diff --git a/debian/patches/ocamldoc.dpatch b/debian/patches/ocamldoc.dpatch deleted file mode 100755 index ffd69a82..00000000 --- a/debian/patches/ocamldoc.dpatch +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## ocamldoc.dpatch by Stephane Glondu -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Various fixes in ocamldoc (see Mantis #4630) - - -@DPATCH@ -diff --git a/ocamldoc/odoc_man.ml b/ocamldoc/odoc_man.ml -index a550118..ae3a120 100644 ---- a/ocamldoc/odoc_man.ml -+++ b/ocamldoc/odoc_man.ml -@@ -204,6 +204,8 @@ class man = - match s.[i] with - '\\' -> Buffer.add_string b "\\(rs" - | '.' -> Buffer.add_string b "\\&." -+ | '\'' -> Buffer.add_string b "\\&'" -+ | '-' -> Buffer.add_string b "\\-" - | c -> Buffer.add_char b c - done; - Buffer.contents b -@@ -633,15 +635,15 @@ class man = - - (** Print groff string for a module comment.*) - method man_of_module_comment b text = -- bs b "\n.pp\n"; -+ bs b "\n.PP\n"; - self#man_of_text b [Code ("=== "^(Odoc_misc.string_of_text text)^" ===")]; -- bs b "\n.pp\n" -+ bs b "\n.PP\n" - - (** Print groff string for a class comment.*) - method man_of_class_comment b text = -- bs b "\n.pp\n"; -+ bs b "\n.PP\n"; - self#man_of_text b [Code ("=== "^(Odoc_misc.string_of_text text)^" ===")]; -- bs b "\n.pp\n" -+ bs b "\n.PP\n" - - (** Print groff string for an included module. *) - method man_of_included_module b m_name im = diff --git a/debian/patches/stdlib_man_section.dpatch b/debian/patches/stdlib_man_section.dpatch index e4f195c3..dab3fde2 100755 --- a/debian/patches/stdlib_man_section.dpatch +++ b/debian/patches/stdlib_man_section.dpatch @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad ocaml~/ocamldoc/Makefile ocaml/ocamldoc/Makefile ---- ocaml~/ocamldoc/Makefile 2008-10-17 12:22:50.000000000 +0200 -+++ ocaml/ocamldoc/Makefile 2008-10-20 15:00:27.000000000 +0200 +--- ocaml~/ocamldoc/Makefile 2008-01-11 17:13:16.000000000 +0100 ++++ ocaml/ocamldoc/Makefile 2008-11-29 11:32:03.000000000 +0100 @@ -318,7 +318,7 @@ stdlib_man/Pervasives.3o: $(STDLIB_MLIS) $(MKDIR) stdlib_man