From: Samuel Mimram Date: Sun, 16 Apr 2006 23:31:48 +0000 (+0000) Subject: Importing 3.09.2rc1 changes. X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~655 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7d5661d6bc2e92cb70b487f9c93b1580f3f6946b;p=ocaml.git Importing 3.09.2rc1 changes. --- diff --git a/debian/changelog b/debian/changelog index c6cff54a..9852a61d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,20 @@ -ocaml (3.09.1-4) UNRELEASED; urgency=low +ocaml (3.09.1+3.09.2rc1-1) experimental; urgency=low [ Julien Cristau ] * Remove dh_gencontrol line for ocaml-source from the binary-arch target (ocaml-source is built in binary-indep). - * Add patch from upstream to fix handling of `new' in camlp4 - (Closes: #355651). + * New upstream release candidate: + + add support for GNU/Hurd (Closes: #358274). + + fix handling of `new' in camlp4 which caused stack overflow (Closes: + #355651). + * Drop kbsd-gnu.dpatch, obsolete. [ Samuel Mimram ] * Use new icon, closes: #358946. * Link to README.Debian instead of README.Debian.gz in /usr/share/doc/ocaml-base, closes: #355975. - -- Samuel Mimram Sat, 25 Mar 2006 13:52:14 +0000 + -- Julien Cristau Thu, 30 Mar 2006 15:10:14 +0200 ocaml (3.09.1-3) unstable; urgency=low diff --git a/debian/copyright.in b/debian/copyright.in index 2383f444..6f12fb40 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -1,14 +1,17 @@ This package was debianized by Sven Luther on Fri, 14 Dec 2001 12:44:03 +0100. -It was downloaded from - - http://caml.inria.fr/pub/distrib/ocaml-#OcamlMAJOR#/ocaml-#OcamlABI#.tar.gz +It was downloaded from :pserver:anoncvs@camlcvs.inria.fr/caml +(module ocaml, tag ocaml3092rc1). Upstream Authors: Xavier Leroy, Jerome Vouillon and Damien Doligez Upstream Author for the camlp4 part: Daniel de Rauglaudre -Copyright: +Copyright 1996-2006 Institut National de Recherche en Informatique et en +Automatique. +Emacs mode copyright 1996-1998 Ian T Zimmerman . +Tcl/tk binding copyright 1999-2002 Institut National de Recherche en +Informatique et en Automatique and Kyoto University. In the following, "the Library" refers to all files marked "Copyright INRIA" in the following directories and their sub-directories: @@ -22,7 +25,7 @@ following directories and their sub-directories: tools, toplevel, typing, utils, yacc and the "emacs bindings" refer to all files marked "Copyright INRIA" in -the followin directory : +the following directory: emacs diff --git a/debian/patches/00list b/debian/patches/00list index 64990b6a..f2583a23 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -2,7 +2,7 @@ versioned_libdir objinfo dumpobj man-ocamlmklib -kbsd-gnu +#kbsd-gnu alpha_ld_no-relax call_ld_with_proper_flags -pr_o +#pr_o diff --git a/debian/patches/alpha_ld_no-relax.dpatch b/debian/patches/alpha_ld_no-relax.dpatch index 6c398e68..244ad0cc 100644 --- a/debian/patches/alpha_ld_no-relax.dpatch +++ b/debian/patches/alpha_ld_no-relax.dpatch @@ -6,9 +6,9 @@ ## DP: code (bug#338437) @DPATCH@ - ---- ocaml-3.09.0.orig/configure 2005-09-24 02:19:09.000000000 -0700 -+++ ocaml-3.09.0/configure 2005-12-07 22:03:36.019001353 -0800 +diff -urNad ocaml-3.09.1+3.09.2rc1~/configure ocaml-3.09.1+3.09.2rc1/configure +--- ocaml-3.09.1+3.09.2rc1~/configure 2006-03-30 17:39:44.000000000 +0200 ++++ ocaml-3.09.1+3.09.2rc1/configure 2006-03-30 17:39:49.000000000 +0200 @@ -268,7 +268,8 @@ gcc,alpha*-*-linux*) if cc="$bytecc" sh ./hasgot -mieee; then @@ -19,7 +19,7 @@ cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts="-n32" -@@ -612,6 +613,7 @@ +@@ -623,6 +624,7 @@ nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs";; diff --git a/debian/patches/call_ld_with_proper_flags.dpatch b/debian/patches/call_ld_with_proper_flags.dpatch index 523bba8b..feaa2007 100644 --- a/debian/patches/call_ld_with_proper_flags.dpatch +++ b/debian/patches/call_ld_with_proper_flags.dpatch @@ -7,18 +7,18 @@ ## DP: gcc. @DPATCH@ - ---- ocaml-3.09.1.orig/Makefile 2005-09-24 18:20:36.000000000 +0200 -+++ ocaml-3.09.1/Makefile 2006-01-12 10:17:42.000000000 +0100 +diff -urNad ocaml-3.09.1+3.09.2rc1~/Makefile ocaml-3.09.1+3.09.2rc1/Makefile +--- ocaml-3.09.1+3.09.2rc1~/Makefile 2006-03-30 17:40:58.000000000 +0200 ++++ ocaml-3.09.1+3.09.2rc1/Makefile 2006-03-30 17:41:00.000000000 +0200 @@ -313,6 +313,7 @@ partialclean:: - rm -f ocaml toplevel/toplevellib.cma + rm -f ocaml toplevel/toplevellib.cma +Wl = -Wl, # The configuration file utils/config.ml: utils/config.mlp config/Makefile -@@ -324,8 +324,8 @@ +@@ -324,8 +325,8 @@ -e 's|%%BYTELINK%%|$(BYTECC) $(BYTECCLINKOPTS)|' \ -e 's|%%NATIVECC%%|$(NATIVECC) $(NATIVECCCOMPOPTS)|' \ -e 's|%%NATIVELINK%%|$(NATIVECC) $(NATIVECCLINKOPTS)|' \ diff --git a/debian/patches/versioned_libdir.dpatch.in b/debian/patches/versioned_libdir.dpatch.in index 2b45c5ac..2f862674 100755 --- a/debian/patches/versioned_libdir.dpatch.in +++ b/debian/patches/versioned_libdir.dpatch.in @@ -21,7 +21,7 @@ exit 0 diff -ur ocaml.orig/camlp4/config/configure_batch ocaml/camlp4/config/configure_batch --- ocaml.orig/camlp4/config/configure_batch.orig 2003-09-30 18:11:57.000000000 +0200 +++ ocaml/camlp4/config/configure_batch 2003-09-30 18:12:51.000000000 +0200 -@@ -94,13 +94,13 @@ +@@ -103,13 +103,13 @@ *) echo "BINDIR=$bindir" >> Makefile.cnf;; esac case "$libdir" in @@ -42,7 +42,7 @@ diff -ur ocaml.orig/camlp4/config/configure_batch ocaml/camlp4/config/configure_ diff -ur ocaml.orig/configure ocaml/configure --- ocaml.orig/configure 2003-09-30 18:09:47.000000000 +0200 +++ ocaml/configure 2003-09-30 18:10:12.000000000 +0200 -@@ -149,8 +149,8 @@ +@@ -146,8 +146,8 @@ *) echo "BINDIR=$bindir" >> Makefile;; esac case "$libdir" in