From e2364d2fa2bf1444bc1cd8b20b1b19a2aa2dd586 Mon Sep 17 00:00:00 2001 From: Samuel Mimram Date: Thu, 8 Sep 2005 18:42:10 +0000 Subject: [PATCH] Added a patch to correct Map.fold order. --- debian/changelog | 16 ++++++++++------ debian/patches/00list | 2 +- debian/patches/map_fold_order.dpatch | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100755 debian/patches/map_fold_order.dpatch diff --git a/debian/changelog b/debian/changelog index 85797960..6c4a10f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,7 +38,7 @@ ocaml (3.08.3-8) unstable; urgency=low * debian/ocaml-md5sums/{configure,feeding.sh,Makefile,ocaml-md5sums.ml.in}: - New files * debian/rules: Update ocaml-md5sums files location accordingly - + * Move ocaml-nox menu file to ocaml-interp since the toplevel is provided by ocaml-interp * debian/ocaml-interp.menu: @@ -47,24 +47,24 @@ ocaml (3.08.3-8) unstable; urgency=low the menu to be displayed * debian/ocaml-interp.dirs: Add pixmaps directory * debian/ocaml-nox.dirs: Remove pixmaps directory - + * Move xpm files away from the /usr/X11R6 deprecated directory hierarchy to /usr/share/pixmaps, as per Policy (11.8.7) * debian/rules: install JoeCaml.xpm in /usr/share/pixmaps within the ocaml-interp package * debian/ocaml-interp.menu: Change pixmap location - + * Really install menu files * debian/rules: uncomment dh_installmenu in the build-common target - + * debian/ocaml-nox.preinst: Remove bashism - + * Add dependencies on gcc and binutils for all interpreters since OCaml compilers may use of them (Closes: Bug#322722) * debian/control: - [ocaml-nox]: Add dependency on both gcc and binutils - [ocaml-native-compilers]: Likewise - + Changes by Stefano Zacchiroli: * debian/rules - remove spurious CVS directories from labltk examples @@ -74,6 +74,10 @@ ocaml (3.08.3-8) unstable; urgency=low ocamlfind is available, compiling with findlib will use the native compilers + Changes by Samuel Mimram: + * debain/patches/map_fold_order.dpatch: added a patch to make Map.fold order + conform to the specification (Closes: #327211) + -- Debian OCaml Maintainers Thu, 08 Sep 2005 12:46:36 +0200 ocaml (3.08.3-7) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 0bd6abba..54c87f47 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -4,4 +4,4 @@ man-ocamlmklib asmcomp_amd64_emit.mlp fix_i386_gcc4_build byterun_interp_ia64_fix - +map_fold_order diff --git a/debian/patches/map_fold_order.dpatch b/debian/patches/map_fold_order.dpatch new file mode 100755 index 00000000..5763d77b --- /dev/null +++ b/debian/patches/map_fold_order.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## map_fold_order.dpatch by Samuel Mimram +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make Map.fold order conform to the specification. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./stdlib/map.ml /tmp/dpep-work.68QXab/ocaml-3.08.3/stdlib/map.ml +--- ./stdlib/map.ml 2004-04-23 12:01:33.000000000 +0200 ++++ /tmp/dpep-work.68QXab/ocaml-3.08.3/stdlib/map.ml 2005-09-08 20:27:30.000000000 +0200 +@@ -161,7 +161,7 @@ + match m with + Empty -> accu + | Node(l, v, d, r, _) -> +- fold f l (f v d (fold f r accu)) ++ fold f r (f v d (fold f l accu)) + + type 'a enumeration = End | More of key * 'a * 'a t * 'a enumeration + -- 2.30.2