[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.11.1+debian1-5-g9791dec

Romain Beauxis toots at rastageeks.org
Wed Feb 10 23:17:34 UTC 2010 

The following commit has been merged in the master branch:
commit 85cbc6cfcd472696c7ed2007d989ee068b74975e
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Feb 10 16:20:46 2010 -0600

    Updated to ocaml 3.11.2

diff --git a/debian/changelog b/debian/changelog
index 4afd2f6..3bab80d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mingw32-ocaml (3.11.2+debian1) unstable; urgency=low
+
+  * Updated to ocaml 3.11.2 
+  * Refreshed patches.
+  * Bumped standards.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 10 Feb 2010 16:13:05 -0600
+
 mingw32-ocaml (3.11.1+debian2) unstable; urgency=low
 
   * Added a patch to also remove all binary objects
diff --git a/debian/control b/debian/control
index ea9022e..74b6919 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Build-Depends: cdbs, debhelper (>= 7), quilt, mingw32, gcc-multilib [amd64], 
                ocaml-nox, camlp4, m4
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mingw32-ocaml.git
 
diff --git a/debian/patches/flexdll-mingw-cross.patch b/debian/patches/flexdll-mingw-cross.patch
index 38fc1e5..6c48b37 100644
--- a/debian/patches/flexdll-mingw-cross.patch
+++ b/debian/patches/flexdll-mingw-cross.patch
@@ -1,7 +1,7 @@
 Index: build-tree/flexdll/reloc.ml
 ===================================================================
---- build-tree.orig/flexdll/reloc.ml	2010-01-07 00:48:19.000000000 +0100
-+++ build-tree/flexdll/reloc.ml	2010-01-07 00:48:33.000000000 +0100
+--- build-tree.orig/flexdll/reloc.ml	2010-02-10 16:15:41.000000000 -0600
++++ build-tree/flexdll/reloc.ml	2010-02-10 16:16:30.000000000 -0600
 @@ -106,7 +106,7 @@
    | `MINGW -> "-mno-cygwin "
    | _ -> ""
@@ -42,8 +42,8 @@ Index: build-tree/flexdll/reloc.ml
  	    file
 Index: build-tree/flexdll/Makefile
 ===================================================================
---- build-tree.orig/flexdll/Makefile	2008-11-10 14:26:25.000000000 +0100
-+++ build-tree/flexdll/Makefile	2010-01-07 00:48:21.000000000 +0100
+--- build-tree.orig/flexdll/Makefile	2008-11-10 07:26:25.000000000 -0600
++++ build-tree/flexdll/Makefile	2010-02-10 16:15:41.000000000 -0600
 @@ -113,7 +113,7 @@
  upload_bin_64:
  	PACKAGE_BIN_SUFFIX=-amd64 $(MAKE) upload_bin
diff --git a/debian/patches/flexdll-no-cygpath.patch b/debian/patches/flexdll-no-cygpath.patch
index 65b8755..47ded79 100644
--- a/debian/patches/flexdll-no-cygpath.patch
+++ b/debian/patches/flexdll-no-cygpath.patch
@@ -1,7 +1,7 @@
 Index: build-tree/flexdll/reloc.ml
 ===================================================================
---- build-tree.orig/flexdll/reloc.ml	2010-01-07 00:48:22.000000000 +0100
-+++ build-tree/flexdll/reloc.ml	2010-01-07 00:48:23.000000000 +0100
+--- build-tree.orig/flexdll/reloc.ml	2010-02-10 16:15:41.000000000 -0600
++++ build-tree/flexdll/reloc.ml	2010-02-10 16:15:41.000000000 -0600
 @@ -938,7 +938,7 @@
      parse_cmdline ();
      setup_toolchain ();
diff --git a/debian/patches/flexdll-no-directory.patch b/debian/patches/flexdll-no-directory.patch
index 48b75e8..1a96fed 100644
--- a/debian/patches/flexdll-no-directory.patch
+++ b/debian/patches/flexdll-no-directory.patch
@@ -4,8 +4,8 @@ want '-lvirt' to "discover" the OCaml bindings directory.
 
 Index: build-tree/flexdll/reloc.ml
 ===================================================================
---- build-tree.orig/flexdll/reloc.ml	2008-11-06 13:54:58.000000000 +0100
-+++ build-tree/flexdll/reloc.ml	2010-01-07 00:48:36.000000000 +0100
+--- build-tree.orig/flexdll/reloc.ml	2008-11-06 06:54:58.000000000 -0600
++++ build-tree/flexdll/reloc.ml	2010-02-10 16:16:32.000000000 -0600
 @@ -109,7 +109,7 @@
    Filename.dirname (get_output1 (Printf.sprintf "gcc %s-print-libgcc-file-name" extra))
  
diff --git a/debian/patches/flexdll-real-objdump.patch b/debian/patches/flexdll-real-objdump.patch
index 6f20fe5..114bc4f 100644
--- a/debian/patches/flexdll-real-objdump.patch
+++ b/debian/patches/flexdll-real-objdump.patch
@@ -1,7 +1,7 @@
 Index: build-tree/flexdll/reloc.ml
 ===================================================================
---- build-tree.orig/flexdll/reloc.ml	2010-01-07 00:48:21.000000000 +0100
-+++ build-tree/flexdll/reloc.ml	2010-01-07 00:48:31.000000000 +0100
+--- build-tree.orig/flexdll/reloc.ml	2010-02-10 16:15:41.000000000 -0600
++++ build-tree/flexdll/reloc.ml	2010-02-10 16:16:28.000000000 -0600
 @@ -436,7 +436,7 @@
        failwith "Creation of import library not supported for this toolchain"
    | `CYGWIN | `MINGW ->
diff --git a/debian/patches/mingw32-ocaml-combined-Makefile.patch b/debian/patches/mingw32-ocaml-combined-Makefile.patch
index 5f1418d..a8d3ff0 100644
--- a/debian/patches/mingw32-ocaml-combined-Makefile.patch
+++ b/debian/patches/mingw32-ocaml-combined-Makefile.patch
@@ -4,10 +4,10 @@ combine all objects into one Makefile, and make sure the source is
 defended by #ifdef/#ifndef WIN32 ... #endif, around the whole files as
 necessary.
 
-Index: build-tree/ocaml-3.11.1/asmrun/Makefile
+Index: build-tree/ocaml-3.11.2/asmrun/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/asmrun/Makefile	2007-11-15 14:21:15.000000000 +0100
-+++ build-tree/ocaml-3.11.1/asmrun/Makefile	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/asmrun/Makefile	2007-11-15 07:21:15.000000000 -0600
++++ build-tree/ocaml-3.11.2/asmrun/Makefile	2010-02-10 16:15:41.000000000 -0600
 @@ -26,7 +26,7 @@
    misc.o freelist.o major_gc.o minor_gc.o memory.o alloc.o compare.o ints.o \
    floats.o str.o array.o io.o extern.o intern.o hash.o sys.o parsing.o \
@@ -35,10 +35,10 @@ Index: build-tree/ocaml-3.11.1/asmrun/Makefile
    dynlink.c signals.c
  
  clean::
-Index: build-tree/ocaml-3.11.1/byterun/Makefile.common
+Index: build-tree/ocaml-3.11.2/byterun/Makefile.common
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/byterun/Makefile.common	2009-05-25 14:25:25.000000000 +0200
-+++ build-tree/ocaml-3.11.1/byterun/Makefile.common	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/byterun/Makefile.common	2009-05-25 07:25:25.000000000 -0500
++++ build-tree/ocaml-3.11.2/byterun/Makefile.common	2010-02-10 16:15:41.000000000 -0600
 @@ -24,7 +24,7 @@
    compare.o ints.o floats.o str.o array.o io.o extern.o intern.o \
    hash.o sys.o meta.o parsing.o gc_ctrl.o terminfo.o md5.o obj.o \
@@ -48,10 +48,10 @@ Index: build-tree/ocaml-3.11.1/byterun/Makefile.common
  
  PRIMS=\
    alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c \
-Index: build-tree/ocaml-3.11.1/byterun/unix.c
+Index: build-tree/ocaml-3.11.2/byterun/unix.c
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/byterun/unix.c	2008-12-03 13:39:44.000000000 +0100
-+++ build-tree/ocaml-3.11.1/byterun/unix.c	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/byterun/unix.c	2008-12-03 06:39:44.000000000 -0600
++++ build-tree/ocaml-3.11.2/byterun/unix.c	2010-02-10 16:15:41.000000000 -0600
 @@ -15,6 +15,8 @@
  
  /* Unix-specific stuff */
@@ -67,13 +67,13 @@ Index: build-tree/ocaml-3.11.1/byterun/unix.c
  #endif
 +
 +#endif /* !WIN32 */
-Index: build-tree/ocaml-3.11.1/byterun/win32.c
+Index: build-tree/ocaml-3.11.2/byterun/win32.c
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/byterun/win32.c	2010-01-07 00:42:11.000000000 +0100
-+++ build-tree/ocaml-3.11.1/byterun/win32.c	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/byterun/win32.c	2010-02-10 16:15:41.000000000 -0600
++++ build-tree/ocaml-3.11.2/byterun/win32.c	2010-02-10 16:15:41.000000000 -0600
 @@ -13,6 +13,8 @@
  
- /* $Id: win32.c,v 1.36 2008/04/22 12:24:10 frisch Exp $ */
+ /* $Id: win32.c 8873 2008-04-22 12:24:10Z frisch $ */
  
 +#ifdef WIN32
 +
@@ -86,10 +86,10 @@ Index: build-tree/ocaml-3.11.1/byterun/win32.c
  }
 +
 +#endif /* WIN32 */
-Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile
+Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile	2010-01-07 00:42:11.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile	2010-02-10 16:15:41.000000000 -0600
++++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile	2010-02-10 16:15:41.000000000 -0600
 @@ -20,8 +20,8 @@
  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
  COMPFLAGS=-warn-error A -g
@@ -127,13 +127,13 @@ Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile
  
  # See remark above: force static linking of libthreadsnat.a
  threads.cmxa: $(THREAD_OBJS:.cmo=.cmx)
-Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/posix.c
+Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/posix.c
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/posix.c	2009-03-28 18:35:59.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/posix.c	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/posix.c	2009-03-28 12:35:59.000000000 -0500
++++ build-tree/ocaml-3.11.2/otherlibs/systhreads/posix.c	2010-02-10 16:15:41.000000000 -0600
 @@ -13,6 +13,8 @@
  
- /* $Id: posix.c,v 1.58.2.2 2009/03/28 17:35:59 xleroy Exp $ */
+ /* $Id: posix.c 9201 2009-03-28 17:35:59Z xleroy $ */
  
 +#ifndef WIN32
 +
@@ -145,13 +145,13 @@ Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/posix.c
  }
  
 +#endif /* !WIN32 */
-Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/win32.c
+Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/win32.c
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/win32.c	2007-10-31 10:12:29.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/win32.c	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/win32.c	2007-10-31 04:12:29.000000000 -0500
++++ build-tree/ocaml-3.11.2/otherlibs/systhreads/win32.c	2010-02-10 16:15:41.000000000 -0600
 @@ -13,6 +13,8 @@
  
- /* $Id: win32.c,v 1.45 2007/10/31 09:12:29 xleroy Exp $ */
+ /* $Id: win32.c 8468 2007-10-31 09:12:29Z xleroy $ */
  
 +#ifdef WIN32
 +
diff --git a/debian/patches/mingw32-ocaml-disable-cmxs.patch b/debian/patches/mingw32-ocaml-disable-cmxs.patch
index 4ef3aaf..d8257f0 100644
--- a/debian/patches/mingw32-ocaml-disable-cmxs.patch
+++ b/debian/patches/mingw32-ocaml-disable-cmxs.patch
@@ -1,10 +1,10 @@
 I couldn't get *.cmxs files to build in the cross-compiler.  This
 patch disables them.
 
-Index: build-tree/ocaml-3.11.1/otherlibs/Makefile.shared
+Index: build-tree/ocaml-3.11.2/otherlibs/Makefile.shared
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/Makefile.shared	2008-07-15 17:31:32.000000000 +0200
-+++ build-tree/ocaml-3.11.1/otherlibs/Makefile.shared	2010-01-07 00:42:04.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/otherlibs/Makefile.shared	2008-07-15 10:31:32.000000000 -0500
++++ build-tree/ocaml-3.11.2/otherlibs/Makefile.shared	2010-02-10 16:15:41.000000000 -0600
 @@ -42,7 +42,8 @@
  
  all: lib$(CLIBNAME).$(A) $(LIBNAME).cma $(CMIFILES)
diff --git a/debian/patches/mingw32-ocaml-filename-win32-dirsep.patch b/debian/patches/mingw32-ocaml-filename-win32-dirsep.patch
index d55e8ca..899e34c 100644
--- a/debian/patches/mingw32-ocaml-filename-win32-dirsep.patch
+++ b/debian/patches/mingw32-ocaml-filename-win32-dirsep.patch
@@ -3,10 +3,10 @@ the default OCaml this has the negative effect of causing it to
 use '\' character in paths.  Since it's really running on a Linux
 kernel, that won't work.  This is a quick and dirty fix.
 
-Index: build-tree/ocaml-3.11.1/stdlib/filename.ml
+Index: build-tree/ocaml-3.11.2/stdlib/filename.ml
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/stdlib/filename.ml	2008-11-20 19:36:52.000000000 +0100
-+++ build-tree/ocaml-3.11.1/stdlib/filename.ml	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/stdlib/filename.ml	2009-09-16 09:24:11.000000000 -0500
++++ build-tree/ocaml-3.11.2/stdlib/filename.ml	2010-02-10 16:15:41.000000000 -0600
 @@ -68,7 +68,7 @@
  module Win32 = struct
    let current_dir_name = "."
diff --git a/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch b/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
index 270620f..4234af7 100644
--- a/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
+++ b/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
@@ -1,7 +1,7 @@
-Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt	2010-01-12 12:25:56.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt	2010-01-12 12:26:48.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt	2010-02-10 16:15:42.000000000 -0600
++++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt	2010-02-10 16:16:06.000000000 -0600
 @@ -37,7 +37,7 @@
  allopt: lib$(LIBNAME).$(A) $(LIBNAME).cmxa $(LIBNAME).cmxs $(CMIFILES)
  
diff --git a/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch b/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch
index 9647b3b..2110bab 100644
--- a/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch
+++ b/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch
@@ -1,7 +1,7 @@
-Index: build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt
+Index: build-tree/ocaml-3.11.2/otherlibs/win32unix/Makefile.nt
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt	2010-01-12 12:25:29.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt	2010-01-12 12:25:39.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/otherlibs/win32unix/Makefile.nt	2008-07-29 03:31:41.000000000 -0500
++++ build-tree/ocaml-3.11.2/otherlibs/win32unix/Makefile.nt	2010-02-10 16:15:41.000000000 -0600
 @@ -40,7 +40,7 @@
  COBJS=$(ALL_FILES:.c=.$(O))
  CAMLOBJS=unix.cmo unixLabels.cmo
@@ -11,10 +11,10 @@ Index: build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt
  EXTRACAMLFLAGS=-nolabels
  EXTRACFLAGS=-I../unix
  HEADERS=unixsupport.h
-Index: build-tree/ocaml-3.11.1/otherlibs/str/Makefile
+Index: build-tree/ocaml-3.11.2/otherlibs/str/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/str/Makefile	2010-01-12 12:25:29.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/str/Makefile	2010-01-12 12:25:39.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/otherlibs/str/Makefile	2007-11-06 09:16:56.000000000 -0600
++++ build-tree/ocaml-3.11.2/otherlibs/str/Makefile	2010-02-10 16:15:41.000000000 -0600
 @@ -19,6 +19,7 @@
  LIBNAME=str
  COBJS=strstubs.$(O)
@@ -23,10 +23,10 @@ Index: build-tree/ocaml-3.11.1/otherlibs/str/Makefile
  
  include ../Makefile
  
-Index: build-tree/ocaml-3.11.1/otherlibs/num/Makefile
+Index: build-tree/ocaml-3.11.2/otherlibs/num/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/num/Makefile	2010-01-12 12:25:29.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/num/Makefile	2010-01-12 12:25:39.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/otherlibs/num/Makefile	2008-09-10 11:10:43.000000000 -0500
++++ build-tree/ocaml-3.11.2/otherlibs/num/Makefile	2010-02-10 16:15:41.000000000 -0600
 @@ -21,6 +21,7 @@
    ratio.cmo num.cmo arith_status.cmo
  CMIFILES=big_int.cmi nat.cmi num.cmi ratio.cmi arith_status.cmi
@@ -35,10 +35,10 @@ Index: build-tree/ocaml-3.11.1/otherlibs/num/Makefile
  
  include ../Makefile
  
-Index: build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt
+Index: build-tree/ocaml-3.11.2/otherlibs/win32graph/Makefile.nt
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt	2010-01-12 12:25:30.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt	2010-01-12 12:25:39.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/otherlibs/win32graph/Makefile.nt	2007-11-06 09:16:56.000000000 -0600
++++ build-tree/ocaml-3.11.2/otherlibs/win32graph/Makefile.nt	2010-02-10 16:15:41.000000000 -0600
 @@ -18,7 +18,7 @@
  CAMLOBJS=graphics.cmo
  WIN32LIBS=$(call SYSLIB,kernel32) $(call SYSLIB,gdi32) $(call SYSLIB,user32)
@@ -48,10 +48,10 @@ Index: build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt
  
  include ../Makefile.nt
  
-Index: build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt
+Index: build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile.nt
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt	2010-01-12 12:25:30.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt	2010-01-12 12:25:39.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/otherlibs/bigarray/Makefile.nt	2008-01-04 09:01:48.000000000 -0600
++++ build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile.nt	2010-02-10 16:15:41.000000000 -0600
 @@ -19,6 +19,7 @@
  COBJS=bigarray_stubs.$(O) mmap_win32.$(O)
  CAMLOBJS=bigarray.cmo
@@ -60,10 +60,10 @@ Index: build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt
  
  include ../Makefile.nt
  
-Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt	2010-01-12 12:25:48.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt	2010-01-12 12:25:56.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt	2007-11-06 09:16:56.000000000 -0600
++++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt	2010-02-10 16:16:08.000000000 -0600
 @@ -21,6 +21,7 @@
  COMPFLAGS=-warn-error A -g
  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
diff --git a/debian/patches/mingw32-ocaml-force-os-type.patch b/debian/patches/mingw32-ocaml-force-os-type.patch
index 9a4d3ef..c3f33eb 100644
--- a/debian/patches/mingw32-ocaml-force-os-type.patch
+++ b/debian/patches/mingw32-ocaml-force-os-type.patch
@@ -2,10 +2,10 @@ Displayed os_type when calling ocamlc -config is wrong.
 This patch forces the correct value without changing anything
 in the Sys module.
 
-Index: build-tree/ocaml-3.11.1/utils/config.mlp
+Index: build-tree/ocaml-3.11.2/utils/config.mlp
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/utils/config.mlp	2010-01-27 14:11:04.000000000 -0600
-+++ build-tree/ocaml-3.11.1/utils/config.mlp	2010-01-27 14:12:17.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/utils/config.mlp	2009-05-18 04:38:16.000000000 -0500
++++ build-tree/ocaml-3.11.2/utils/config.mlp	2010-02-10 16:15:42.000000000 -0600
 @@ -82,11 +82,7 @@
  let ext_lib = "%%EXT_LIB%%"
  let ext_dll = "%%EXT_DLL%%"
diff --git a/debian/patches/mingw32-ocaml-i386-profiling.patch b/debian/patches/mingw32-ocaml-i386-profiling.patch
index 4b05a53..85abaab 100644
--- a/debian/patches/mingw32-ocaml-i386-profiling.patch
+++ b/debian/patches/mingw32-ocaml-i386-profiling.patch
@@ -1,10 +1,10 @@
 Make sure that PROFILE_* macros are defined on MinGW.  Not sure
 what to put in them yet, so at the moment they are just empty.
 
-Index: build-tree/ocaml-3.11.1/asmrun/i386.S
+Index: build-tree/ocaml-3.11.2/asmrun/i386.S
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/asmrun/i386.S	2008-08-01 10:04:57.000000000 +0200
-+++ build-tree/ocaml-3.11.1/asmrun/i386.S	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/asmrun/i386.S	2008-08-01 03:04:57.000000000 -0500
++++ build-tree/ocaml-3.11.2/asmrun/i386.S	2010-02-10 16:15:41.000000000 -0600
 @@ -64,6 +64,9 @@
          popl %edx; popl %ecx; popl %eax; popl %ebp
  #define PROFILE_C \
diff --git a/debian/patches/mingw32-ocaml-no-stdlib-dir.patch b/debian/patches/mingw32-ocaml-no-stdlib-dir.patch
index 2867e66..b0a1721 100644
--- a/debian/patches/mingw32-ocaml-no-stdlib-dir.patch
+++ b/debian/patches/mingw32-ocaml-no-stdlib-dir.patch
@@ -2,10 +2,10 @@ Not sure if this is right, but OCAML_STDLIB_DIR can be undefined
 in our cross-compiler.  It's only used in a one place in the C
 code so this works around it.
 
-Index: build-tree/ocaml-3.11.1/byterun/dynlink.c
+Index: build-tree/ocaml-3.11.2/byterun/dynlink.c
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/byterun/dynlink.c	2008-04-22 14:24:10.000000000 +0200
-+++ build-tree/ocaml-3.11.1/byterun/dynlink.c	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/byterun/dynlink.c	2008-04-22 07:24:10.000000000 -0500
++++ build-tree/ocaml-3.11.2/byterun/dynlink.c	2010-02-10 16:15:41.000000000 -0600
 @@ -80,7 +80,12 @@
  
    stdlib = getenv("OCAMLLIB");
diff --git a/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch b/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
index a59be5b..77627f4 100644
--- a/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
+++ b/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
@@ -1,7 +1,7 @@
-Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt	2010-01-11 16:40:06.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt	2010-01-11 17:09:35.000000000 -0600
+--- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt	2010-02-10 16:15:42.000000000 -0600
++++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt	2010-02-10 16:15:42.000000000 -0600
 @@ -78,12 +78,14 @@
  install:
  	cp dllthreads.dll $(STUBLIBDIR)/dllthreads.dll
diff --git a/debian/patches/mingw32-ocaml-win32-fixes.patch b/debian/patches/mingw32-ocaml-win32-fixes.patch
index 73bb88a..7c40bda 100644
--- a/debian/patches/mingw32-ocaml-win32-fixes.patch
+++ b/debian/patches/mingw32-ocaml-win32-fixes.patch
@@ -1,9 +1,9 @@
 Misc fixes for byterun/win32.c
 
-Index: build-tree/ocaml-3.11.1/byterun/win32.c
+Index: build-tree/ocaml-3.11.2/byterun/win32.c
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/byterun/win32.c	2008-04-22 14:24:10.000000000 +0200
-+++ build-tree/ocaml-3.11.1/byterun/win32.c	2010-01-07 00:42:34.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/byterun/win32.c	2008-04-22 07:24:10.000000000 -0500
++++ build-tree/ocaml-3.11.2/byterun/win32.c	2010-02-10 16:16:17.000000000 -0600
 @@ -18,7 +18,6 @@
  #include <windows.h>
  #include <stdlib.h>
diff --git a/debian/patches/mingw32-ocaml-win32unix-path.patch b/debian/patches/mingw32-ocaml-win32unix-path.patch
index dc55f7a..7180e26 100644
--- a/debian/patches/mingw32-ocaml-win32unix-path.patch
+++ b/debian/patches/mingw32-ocaml-win32unix-path.patch
@@ -3,10 +3,10 @@ but really they depend on either the ("real") unix library or the
 win32unix library.  Include both, with win32unix first, on the basis
 that this should pick up the correct one in all cases.
 
-Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile
+Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile	2008-07-15 17:31:32.000000000 +0200
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile	2010-01-07 00:42:34.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile	2008-07-15 10:31:32.000000000 -0500
++++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile	2010-02-10 16:16:17.000000000 -0600
 @@ -15,8 +15,8 @@
  
  include ../../config/Makefile
@@ -18,12 +18,12 @@ Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile
  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
  COMPFLAGS=-warn-error A -g
  
-Index: build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile
+Index: build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/bigarray/Makefile	2008-01-04 10:52:27.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/otherlibs/bigarray/Makefile	2008-01-04 03:52:27.000000000 -0600
++++ build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile	2010-02-10 16:15:41.000000000 -0600
 @@ -14,8 +14,8 @@
- # $Id: Makefile,v 1.25 2008/01/04 09:52:27 xleroy Exp $
+ # $Id: Makefile 8748 2008-01-04 09:52:27Z xleroy $
  
  LIBNAME=bigarray
 -EXTRACFLAGS=-I../unix -DIN_OCAML_BIGARRAY -DCAML_NAME_SPACE
@@ -33,10 +33,10 @@ Index: build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile
  COBJS=bigarray_stubs.$(O) mmap_unix.$(O)
  CAMLOBJS=bigarray.cmo
  HEADERS=bigarray.h
-Index: build-tree/ocaml-3.11.1/myocamlbuild.ml
+Index: build-tree/ocaml-3.11.2/myocamlbuild.ml
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/myocamlbuild.ml	2009-06-04 13:33:21.000000000 +0200
-+++ build-tree/ocaml-3.11.1/myocamlbuild.ml	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/myocamlbuild.ml	2010-01-15 07:36:23.000000000 -0600
++++ build-tree/ocaml-3.11.2/myocamlbuild.ml	2010-02-10 16:15:41.000000000 -0600
 @@ -116,9 +116,11 @@
    if mixed then ".."/dir else dir;;
  
@@ -52,10 +52,10 @@ Index: build-tree/ocaml-3.11.1/myocamlbuild.ml
  
  let threads_dir    = if_mixed_dir "otherlibs/threads";;
  let systhreads_dir = if_mixed_dir "otherlibs/systhreads";;
-Index: build-tree/ocaml-3.11.1/ocamldoc/Makefile
+Index: build-tree/ocaml-3.11.2/ocamldoc/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/ocamldoc/Makefile	2009-04-09 15:56:38.000000000 +0200
-+++ build-tree/ocaml-3.11.1/ocamldoc/Makefile	2010-01-07 00:42:11.000000000 +0100
+--- build-tree.orig/ocaml-3.11.2/ocamldoc/Makefile	2009-04-09 08:56:38.000000000 -0500
++++ build-tree/ocaml-3.11.2/ocamldoc/Makefile	2010-02-10 16:15:41.000000000 -0600
 @@ -62,6 +62,7 @@
  INCLUDES_NODEP=	-I $(OCAMLSRCDIR)/stdlib \
  	-I $(OCAMLSRCDIR)/otherlibs/str \
diff --git a/debian/rules b/debian/rules
index 5eb6cd2..9475a25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ DEB_TAR_SRCDIR := .
 
 MINGW32_HOST := i586-mingw32msvc
 FLEXDLL_DIR := flexdll
-OCAML_DIR := ocaml-3.11.1
+OCAML_DIR := ocaml-3.11.2
 FINDLIB_DIR := findlib-1.2.5+debian
 OTHER_LIBS := win32unix str num dynlink bigarray systhreads win32graph
 INSTALL_PATH := $(CURDIR)/debian/mingw32-ocaml
diff --git a/ocaml-3.11.1.tar.gz b/ocaml-3.11.1.tar.gz
deleted file mode 100644
index f0e5c2c..0000000
Binary files a/ocaml-3.11.1.tar.gz and /dev/null differ
diff --git a/ocaml-3.11.2.tar.gz b/ocaml-3.11.2.tar.gz
new file mode 100644
index 0000000..ce0562d
Binary files /dev/null and b/ocaml-3.11.2.tar.gz differ

-- 
mingw32-ocaml packaging

More information about the Pkg-ocaml-maint-commits mailing list