[Pkg-ocaml-maint-commits] r1725 - in trunk/packages/ocaml: branches
branches/3.08.4/debian branches/3.08.4/debian/ocaml-md5sums
branches/3.08.4/debian/patches upstream
Julien Cristau
jcristau-guest at costa.debian.org
Wed Aug 31 20:55:12 UTC 2005
Author: jcristau-guest
Date: 2005-08-31 20:55:08 +0000 (Wed, 31 Aug 2005)
New Revision: 1725
Added:
trunk/packages/ocaml/branches/3.08.4/
trunk/packages/ocaml/upstream/ocaml_3.08.4.orig.tar.gz
Removed:
trunk/packages/ocaml/branches/3.08.4/debian/patches/asmcomp_amd64_emit.mlp.dpatch
trunk/packages/ocaml/branches/3.08.4/debian/patches/fix_i386_gcc4_build.dpatch
Modified:
trunk/packages/ocaml/branches/3.08.4/debian/changelog
trunk/packages/ocaml/branches/3.08.4/debian/control
trunk/packages/ocaml/branches/3.08.4/debian/copyright
trunk/packages/ocaml/branches/3.08.4/debian/ld.conf
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.dirs
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.files
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.postinst
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.prerm
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base.dirs
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base.files
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-compiler-libs.dirs
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.dirs
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.files
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-md5sums/configure
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.dirs
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.postinst
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.preinst
trunk/packages/ocaml/branches/3.08.4/debian/ocaml-opt.files
trunk/packages/ocaml/branches/3.08.4/debian/ocaml.dirs
trunk/packages/ocaml/branches/3.08.4/debian/ocaml.files
trunk/packages/ocaml/branches/3.08.4/debian/patches/00list
trunk/packages/ocaml/branches/3.08.4/debian/patches/versioned_libdir.dpatch
trunk/packages/ocaml/branches/3.08.4/debian/rules
trunk/packages/ocaml/branches/3.08.4/debian/svn-deblayout
Log:
Import new upstream version, and adapt packaging.
Copied: trunk/packages/ocaml/branches/3.08.4 (from rev 1716, trunk/packages/ocaml/trunk)
Modified: trunk/packages/ocaml/branches/3.08.4/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/changelog 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,3 +1,14 @@
+ocaml (3.08.4-1) UNRELEASED; urgency=low
+
+ [Julien Cristau]
+ * New upstream release.
+ + Better escaping in ocamldoc-generated manpages (Closes: #301046).
+ + Fixed ocamldoc.1 (Closes: #304360).
+ * Replace 3.08.3 with 3.08.4 in debian/ where necessary.
+ * Fix XSI:ism in ocaml-nox.preinst.
+
+ -- Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org> Wed, 31 Aug 2005 22:45:57 +0200
+
ocaml (3.08.3-8) UNRELEASED; urgency=low
Changes by Stefano Zacchiroli:
Modified: trunk/packages/ocaml/branches/3.08.4/debian/control
===================================================================
--- trunk/packages/ocaml/trunk/debian/control 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/control 2005-08-31 20:55:08 UTC (rev 1725)
@@ -8,10 +8,10 @@
Package: ocaml-nox
Architecture: any
-Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.08.3, ocaml-interp-3.08.3
+Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.08.4, ocaml-interp-3.08.4
Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
Recommends: ledit, file
-Provides: ocaml-nox-3.08.3 ${F:BestProvides}, libnums-ocaml-dev
+Provides: ocaml-nox-3.08.4 ${F:BestProvides}, libnums-ocaml-dev
Replaces: camlp4, ocaml (<< 3.07.2a-3), libnums-ocaml-dev
Conflicts: camlp4, camlidl (<< 1.04), ocaml (<< 3.07.2a-3), libnums-ocaml-dev
Description: ML language implementation with a class-based object system
@@ -39,9 +39,9 @@
Package: ocaml
Architecture: any
-Depends: ocaml-base (= ${Source-Version}), ocaml-base-3.08.3, ocaml-nox-3.08.3, ocaml-base-nox (>= 3.08.3-6)
+Depends: ocaml-base (= ${Source-Version}), ocaml-base-3.08.4, ocaml-nox-3.08.4
Suggests: xlibs-dev, tcl8.4-dev, tk8.4-dev,
-Provides: ocaml-3.08.3
+Provides: ocaml-3.08.4
Description: ML language implementation with a class-based object system
Objective Caml is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
@@ -67,7 +67,7 @@
Package: ocaml-base-nox
Architecture: any
-Provides: ocaml-base-nox-3.08.3, libnums-ocaml
+Provides: ocaml-base-nox-3.08.4, libnums-ocaml
Depends: ${shlibs:Depends}
Replaces: ocaml-base (<< 3.07.2a-3), libnums-ocaml
Conflicts: ocaml (<< 3.04-2), ocaml-base (<< 3.07.2a-3), libnums-ocaml
@@ -82,8 +82,8 @@
Package: ocaml-base
Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-3.08.3
-Provides: ocaml-base-3.08.3
+Depends: ${shlibs:Depends}, ocaml-base-nox-3.08.4
+Provides: ocaml-base-3.08.4
Description: Runtime system for ocaml bytecode executables
Objective Caml is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
@@ -96,7 +96,7 @@
Package: ocaml-native-compilers
Architecture: alpha amd64 arm hppa i386 ia64 powerpc sparc
-Depends: ocaml-nox (= ${Source-Version}), ocaml-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-nox (= ${Source-Version}), ocaml-nox-3.08.4, ${shlibs:Depends}
Provides: ocaml-best-compilers
Description: Native code compilers of the ocaml suite (the .opt ones)
Objective Caml is an implementation of the ML language, based on
@@ -111,7 +111,7 @@
Package: ocaml-source
Architecture: all
-Provides: ocaml-source-3.08.3
+Provides: ocaml-source-3.08.4
Description: Sources for Objective Caml
Objective Caml is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
@@ -123,8 +123,8 @@
Package: ocaml-interp
Architecture: any
-Provides: ocaml-interp-3.08.3
-Depends: ocaml-base-nox-3.08.3
+Provides: ocaml-interp-3.08.4
+Depends: ocaml-base-nox-3.08.4
Replaces: ocaml (<< 3.07.2a-3)
Conflicts: ocaml (<< 3.07.2a-3)
Description: Ocaml interpreter and standard libraries
@@ -137,8 +137,8 @@
Package: ocaml-compiler-libs
Architecture: any
-Provides: ocaml-compiler-libs-3.08.3
-Depends: ocaml-nox-3.08.3, ocaml-base-nox (>= 3.08.3-6)
+Provides: ocaml-compiler-libs-3.08.4
+Depends: ocaml-nox-3.08.4
Description: Ocaml interpreter and standard libraries
Objective Caml is an implementation of the ML language, based on
the Caml Light dialect extended with a complete class-based object system
Modified: trunk/packages/ocaml/branches/3.08.4/debian/copyright
===================================================================
--- trunk/packages/ocaml/trunk/debian/copyright 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/copyright 2005-08-31 20:55:08 UTC (rev 1725)
@@ -3,7 +3,7 @@
It was downloaded from
- http://caml.inria.fr/pub/distrib/ocaml-3.08/ocaml-3.08.3.tar.gz
+ http://caml.inria.fr/pub/distrib/ocaml-3.08/ocaml-3.08.4.tar.gz
Upstream Authors: Xavier Leroy, Jerome Vouillon and Damien Doligez
Upstream Author for the camlp4 part: Daniel de Rauglaudre
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ld.conf
===================================================================
--- trunk/packages/ocaml/trunk/debian/ld.conf 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ld.conf 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,2 +1,2 @@
-/usr/local/lib/ocaml/3.08.3/stublibs
-/usr/lib/ocaml/3.08.3/stublibs
+/usr/local/lib/ocaml/3.08.4/stublibs
+/usr/lib/ocaml/3.08.4/stublibs
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.dirs 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.dirs 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,4 +1,4 @@
usr/bin
usr/share/man/man1
-usr/lib/ocaml/3.08.3
-usr/lib/ocaml/3.08.3/stublibs
+usr/lib/ocaml/3.08.4
+usr/lib/ocaml/3.08.4/stublibs
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.files
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.files 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.files 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,10 +1,10 @@
usr/bin/ocamlrun
usr/share/man/man1/ocamlrun.1
-usr/lib/ocaml/3.08.3/stublibs/dllunix.so
-usr/lib/ocaml/3.08.3/stublibs/dllstr.so
-usr/lib/ocaml/3.08.3/stublibs/dllbigarray.so
-usr/lib/ocaml/3.08.3/stublibs/dllthreads.so
-usr/lib/ocaml/3.08.3/stublibs/dllvmthreads.so
-usr/lib/ocaml/3.08.3/stublibs/dllmldbm.so
-usr/lib/ocaml/3.08.3/stublibs/dllnums.so
-usr/lib/ocaml/3.08.3/ld.conf
+usr/lib/ocaml/3.08.4/stublibs/dllunix.so
+usr/lib/ocaml/3.08.4/stublibs/dllstr.so
+usr/lib/ocaml/3.08.4/stublibs/dllbigarray.so
+usr/lib/ocaml/3.08.4/stublibs/dllthreads.so
+usr/lib/ocaml/3.08.4/stublibs/dllvmthreads.so
+usr/lib/ocaml/3.08.4/stublibs/dllmldbm.so
+usr/lib/ocaml/3.08.4/stublibs/dllnums.so
+usr/lib/ocaml/3.08.4/ld.conf
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.postinst
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.postinst 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.postinst 2005-08-31 20:55:08 UTC (rev 1725)
@@ -5,25 +5,25 @@
chmod 2775 /usr/local/lib/ocaml
fi
fi
-if [ ! -e /usr/local/lib/ocaml/3.08.3 ]; then
- if mkdir /usr/local/lib/ocaml/3.08.3 2>/dev/null; then
- chown root:staff /usr/local/lib/ocaml/3.08.3
- chmod 2775 /usr/local/lib/ocaml/3.08.3
+if [ ! -e /usr/local/lib/ocaml/3.08.4 ]; then
+ if mkdir /usr/local/lib/ocaml/3.08.4 2>/dev/null; then
+ chown root:staff /usr/local/lib/ocaml/3.08.4
+ chmod 2775 /usr/local/lib/ocaml/3.08.4
fi
fi
-if [ ! -e /usr/local/lib/ocaml/3.08.3/stublibs ]; then
- if mkdir /usr/local/lib/ocaml/3.08.3/stublibs 2>/dev/null; then
- chown root:staff /usr/local/lib/ocaml/3.08.3/stublibs
- chmod 2775 /usr/local/lib/ocaml/3.08.3/stublibs
+if [ ! -e /usr/local/lib/ocaml/3.08.4/stublibs ]; then
+ if mkdir /usr/local/lib/ocaml/3.08.4/stublibs 2>/dev/null; then
+ chown root:staff /usr/local/lib/ocaml/3.08.4/stublibs
+ chmod 2775 /usr/local/lib/ocaml/3.08.4/stublibs
fi
fi
-for i in /usr/lib/ocaml/3.06 /etc/ocaml /var/lib/ocaml; do \
- if [ -e $i/ld.conf ]; then \
- echo "Removing leftover $i/ld.conf"; \
- rm -f $i/ld.conf; \
- rmdir --ignore-fail-on-non-empty $i; \
- fi; \
+for i in /usr/lib/ocaml/3.06 /etc/ocaml /var/lib/ocaml; do
+ if [ -e $i/ld.conf ]; then
+ echo "Removing leftover $i/ld.conf"
+ rm -f $i/ld.conf
+ rmdir --ignore-fail-on-non-empty $i
+ fi
done
#DEBHELPER#
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.prerm
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.prerm 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base-nox.prerm 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,5 +1,5 @@
#!/bin/sh -e
-rmdir /usr/local/lib/ocaml/3.08.3/stublibs 2>/dev/null || true
-rmdir /usr/local/lib/ocaml/3.08.3 2>/dev/null || true
+rmdir /usr/local/lib/ocaml/3.08.4/stublibs 2>/dev/null || true
+rmdir /usr/local/lib/ocaml/3.08.4 2>/dev/null || true
rmdir /usr/local/lib/ocaml 2>/dev/null || true
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base.dirs 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base.dirs 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,2 +1,2 @@
-usr/lib/ocaml/3.08.3/stublibs
+usr/lib/ocaml/3.08.4/stublibs
usr/share/lintian/overrides
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base.files
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base.files 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-base.files 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,3 +1,3 @@
-usr/lib/ocaml/3.08.3/stublibs/dllgraphics.so
-usr/lib/ocaml/3.08.3/stublibs/dlllabltk.so
-usr/lib/ocaml/3.08.3/stublibs/dlltkanim.so
+usr/lib/ocaml/3.08.4/stublibs/dllgraphics.so
+usr/lib/ocaml/3.08.4/stublibs/dlllabltk.so
+usr/lib/ocaml/3.08.4/stublibs/dlltkanim.so
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-compiler-libs.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-compiler-libs.dirs 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3/compiler-libs
+usr/lib/ocaml/3.08.4/compiler-libs
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-interp.dirs 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.dirs 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,3 +1,3 @@
usr/bin
usr/share/man/man1
-usr/lib/ocaml/3.08.3
+usr/lib/ocaml/3.08.4
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.files
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-interp.files 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-interp.files 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,65 +1,65 @@
usr/share/man/man1/ocaml.1
usr/bin/ocaml
-usr/lib/ocaml/3.08.3/stdlib.cma
-usr/lib/ocaml/3.08.3/arg.cmi
-usr/lib/ocaml/3.08.3/array.cmi
-usr/lib/ocaml/3.08.3/arrayLabels.cmi
-usr/lib/ocaml/3.08.3/buffer.cmi
-usr/lib/ocaml/3.08.3/callback.cmi
-usr/lib/ocaml/3.08.3/camlinternalOO.cmi
-usr/lib/ocaml/3.08.3/char.cmi
-usr/lib/ocaml/3.08.3/complex.cmi
-usr/lib/ocaml/3.08.3/digest.cmi
-usr/lib/ocaml/3.08.3/filename.cmi
-usr/lib/ocaml/3.08.3/format.cmi
-usr/lib/ocaml/3.08.3/gc.cmi
-usr/lib/ocaml/3.08.3/genlex.cmi
-usr/lib/ocaml/3.08.3/hashtbl.cmi
-usr/lib/ocaml/3.08.3/int32.cmi
-usr/lib/ocaml/3.08.3/int64.cmi
-usr/lib/ocaml/3.08.3/lazy.cmi
-usr/lib/ocaml/3.08.3/lexing.cmi
-usr/lib/ocaml/3.08.3/list.cmi
-usr/lib/ocaml/3.08.3/listLabels.cmi
-usr/lib/ocaml/3.08.3/map.cmi
-usr/lib/ocaml/3.08.3/marshal.cmi
-usr/lib/ocaml/3.08.3/moreLabels.cmi
-usr/lib/ocaml/3.08.3/nativeint.cmi
-usr/lib/ocaml/3.08.3/obj.cmi
-usr/lib/ocaml/3.08.3/oo.cmi
-usr/lib/ocaml/3.08.3/parsing.cmi
-usr/lib/ocaml/3.08.3/pervasives.cmi
-usr/lib/ocaml/3.08.3/printexc.cmi
-usr/lib/ocaml/3.08.3/printf.cmi
-usr/lib/ocaml/3.08.3/queue.cmi
-usr/lib/ocaml/3.08.3/random.cmi
-usr/lib/ocaml/3.08.3/scanf.cmi
-usr/lib/ocaml/3.08.3/set.cmi
-usr/lib/ocaml/3.08.3/sort.cmi
-usr/lib/ocaml/3.08.3/stack.cmi
-usr/lib/ocaml/3.08.3/stdLabels.cmi
-usr/lib/ocaml/3.08.3/std_exit.cmi
-usr/lib/ocaml/3.08.3/stream.cmi
-usr/lib/ocaml/3.08.3/string.cmi
-usr/lib/ocaml/3.08.3/stringLabels.cmi
-usr/lib/ocaml/3.08.3/sys.cmi
-usr/lib/ocaml/3.08.3/weak.cmi
-usr/lib/ocaml/3.08.3/toplevellib.cma
-usr/lib/ocaml/3.08.3/toploop.cmi
-usr/lib/ocaml/3.08.3/topdirs.cmi
-usr/lib/ocaml/3.08.3/topmain.cmi
-usr/lib/ocaml/3.08.3/unix.cma
-usr/lib/ocaml/3.08.3/unix.cmi
-usr/lib/ocaml/3.08.3/unixLabels.cmi
-usr/lib/ocaml/3.08.3/str.cma
-usr/lib/ocaml/3.08.3/str.cmi
-usr/lib/ocaml/3.08.3/dynlink.cmi
-usr/lib/ocaml/3.08.3/dynlink.cma
-usr/lib/ocaml/3.08.3/bigarray.cmi
-usr/lib/ocaml/3.08.3/bigarray.cma
-usr/lib/ocaml/3.08.3/nums.cma
-usr/lib/ocaml/3.08.3/big_int.cmi
-usr/lib/ocaml/3.08.3/nat.cmi
-usr/lib/ocaml/3.08.3/num.cmi
-usr/lib/ocaml/3.08.3/ratio.cmi
-usr/lib/ocaml/3.08.3/arith_status.cmi
+usr/lib/ocaml/3.08.4/stdlib.cma
+usr/lib/ocaml/3.08.4/arg.cmi
+usr/lib/ocaml/3.08.4/array.cmi
+usr/lib/ocaml/3.08.4/arrayLabels.cmi
+usr/lib/ocaml/3.08.4/buffer.cmi
+usr/lib/ocaml/3.08.4/callback.cmi
+usr/lib/ocaml/3.08.4/camlinternalOO.cmi
+usr/lib/ocaml/3.08.4/char.cmi
+usr/lib/ocaml/3.08.4/complex.cmi
+usr/lib/ocaml/3.08.4/digest.cmi
+usr/lib/ocaml/3.08.4/filename.cmi
+usr/lib/ocaml/3.08.4/format.cmi
+usr/lib/ocaml/3.08.4/gc.cmi
+usr/lib/ocaml/3.08.4/genlex.cmi
+usr/lib/ocaml/3.08.4/hashtbl.cmi
+usr/lib/ocaml/3.08.4/int32.cmi
+usr/lib/ocaml/3.08.4/int64.cmi
+usr/lib/ocaml/3.08.4/lazy.cmi
+usr/lib/ocaml/3.08.4/lexing.cmi
+usr/lib/ocaml/3.08.4/list.cmi
+usr/lib/ocaml/3.08.4/listLabels.cmi
+usr/lib/ocaml/3.08.4/map.cmi
+usr/lib/ocaml/3.08.4/marshal.cmi
+usr/lib/ocaml/3.08.4/moreLabels.cmi
+usr/lib/ocaml/3.08.4/nativeint.cmi
+usr/lib/ocaml/3.08.4/obj.cmi
+usr/lib/ocaml/3.08.4/oo.cmi
+usr/lib/ocaml/3.08.4/parsing.cmi
+usr/lib/ocaml/3.08.4/pervasives.cmi
+usr/lib/ocaml/3.08.4/printexc.cmi
+usr/lib/ocaml/3.08.4/printf.cmi
+usr/lib/ocaml/3.08.4/queue.cmi
+usr/lib/ocaml/3.08.4/random.cmi
+usr/lib/ocaml/3.08.4/scanf.cmi
+usr/lib/ocaml/3.08.4/set.cmi
+usr/lib/ocaml/3.08.4/sort.cmi
+usr/lib/ocaml/3.08.4/stack.cmi
+usr/lib/ocaml/3.08.4/stdLabels.cmi
+usr/lib/ocaml/3.08.4/std_exit.cmi
+usr/lib/ocaml/3.08.4/stream.cmi
+usr/lib/ocaml/3.08.4/string.cmi
+usr/lib/ocaml/3.08.4/stringLabels.cmi
+usr/lib/ocaml/3.08.4/sys.cmi
+usr/lib/ocaml/3.08.4/weak.cmi
+usr/lib/ocaml/3.08.4/toplevellib.cma
+usr/lib/ocaml/3.08.4/toploop.cmi
+usr/lib/ocaml/3.08.4/topdirs.cmi
+usr/lib/ocaml/3.08.4/topmain.cmi
+usr/lib/ocaml/3.08.4/unix.cma
+usr/lib/ocaml/3.08.4/unix.cmi
+usr/lib/ocaml/3.08.4/unixLabels.cmi
+usr/lib/ocaml/3.08.4/str.cma
+usr/lib/ocaml/3.08.4/str.cmi
+usr/lib/ocaml/3.08.4/dynlink.cmi
+usr/lib/ocaml/3.08.4/dynlink.cma
+usr/lib/ocaml/3.08.4/bigarray.cmi
+usr/lib/ocaml/3.08.4/bigarray.cma
+usr/lib/ocaml/3.08.4/nums.cma
+usr/lib/ocaml/3.08.4/big_int.cmi
+usr/lib/ocaml/3.08.4/nat.cmi
+usr/lib/ocaml/3.08.4/num.cmi
+usr/lib/ocaml/3.08.4/ratio.cmi
+usr/lib/ocaml/3.08.4/arith_status.cmi
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-md5sums/configure
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-md5sums/configure 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,5 +1,5 @@
#!/bin/sh
-DEFAULT="/var/lib/ocaml/3.08.3/md5sums"
+DEFAULT="/var/lib/ocaml/3.08.4/md5sums"
if [ -z "$1" ]; then
echo "No dir provided, using default: $DEFAULT"
echo "You can override it with: ./configure [ md5sums_dir ]"
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.dirs 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.dirs 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,7 +1,7 @@
usr/bin
-usr/lib/ocaml/3.08.3
-usr/lib/ocaml/3.08.3/config
-usr/include/ocaml/3.08.3
+usr/lib/ocaml/3.08.4
+usr/lib/ocaml/3.08.4/config
+usr/include/ocaml/3.08.4
usr/share/man/man1
usr/share/man/man3
usr/share/texmf/tex/latex/misc
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.postinst
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.postinst 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,6 +1,6 @@
#!/bin/sh -e
-ln -sf /usr/lib/ocaml/3.08.3/caml /usr/include/caml
+ln -sf /usr/lib/ocaml/3.08.4/caml /usr/include/caml
ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-nox
ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-nox
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.preinst
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.preinst 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-nox.preinst 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,6 +1,6 @@
#!/bin/sh -e
-if [ ! -h /usr/include/caml -a -e /usr/include/caml ]; then
+if [ ! -h /usr/include/caml ] && [ -e /usr/include/caml ]; then
echo "WARNING, /usr/include/caml is not a symlink !!!!"
fi
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml-opt.files
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-opt.files 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml-opt.files 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,6 +1,6 @@
usr/bin/labltk
-usr/lib/ocaml/3.08.3/libgraphics.a
-usr/lib/ocaml/3.08.3/labltk
-usr/lib/ocaml/3.08.3/graphics.cmx
-usr/lib/ocaml/3.08.3/graphics.cmxa
-usr/lib/ocaml/3.08.3/graphics.a
+usr/lib/ocaml/3.08.4/libgraphics.a
+usr/lib/ocaml/3.08.4/labltk
+usr/lib/ocaml/3.08.4/graphics.cmx
+usr/lib/ocaml/3.08.4/graphics.cmxa
+usr/lib/ocaml/3.08.4/graphics.a
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.dirs 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml.dirs 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,2 +1,2 @@
usr/bin
-usr/lib/ocaml/3.08.3
+usr/lib/ocaml/3.08.4
Modified: trunk/packages/ocaml/branches/3.08.4/debian/ocaml.files
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.files 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/ocaml.files 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,7 +1,7 @@
usr/bin/labltk
-usr/lib/ocaml/3.08.3/graphics.cma
-usr/lib/ocaml/3.08.3/graphics.cmi
-usr/lib/ocaml/3.08.3/graphicsX11.cmi
-usr/lib/ocaml/3.08.3/graphics.mli
-usr/lib/ocaml/3.08.3/graphicsX11.mli
-usr/lib/ocaml/3.08.3/labltk
+usr/lib/ocaml/3.08.4/graphics.cma
+usr/lib/ocaml/3.08.4/graphics.cmi
+usr/lib/ocaml/3.08.4/graphicsX11.cmi
+usr/lib/ocaml/3.08.4/graphics.mli
+usr/lib/ocaml/3.08.4/graphicsX11.mli
+usr/lib/ocaml/3.08.4/labltk
Modified: trunk/packages/ocaml/branches/3.08.4/debian/patches/00list
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/patches/00list 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,7 +1,4 @@
versioned_libdir
objinfo
man-ocamlmklib
-asmcomp_amd64_emit.mlp
-fix_i386_gcc4_build
byterun_interp_ia64_fix
-
Deleted: trunk/packages/ocaml/branches/3.08.4/debian/patches/asmcomp_amd64_emit.mlp.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/asmcomp_amd64_emit.mlp.dpatch 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/patches/asmcomp_amd64_emit.mlp.dpatch 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## asmcomp_amd64_emit.mlp.dpatch by <julien.cristau at ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream fix for code generation bug on amd64 (PR#3640)
-
- at DPATCH@
-diff -urNad ocaml-3.08.3.orig/asmcomp/amd64/emit.mlp ocaml-3.08.3/asmcomp/amd64/emit.mlp
---- ocaml-3.08.3.orig/asmcomp/amd64/emit.mlp 2004-07-01 18:09:03.000000000 +0200
-+++ ocaml-3.08.3/asmcomp/amd64/emit.mlp 2005-06-14 03:08:25.481518269 +0200
-@@ -10,7 +10,7 @@
- (* *)
- (***********************************************************************)
-
--(* $Id: emit.mlp,v 1.6.6.1 2004/07/01 16:09:03 xleroy Exp $ *)
-+(* $Id: emit.mlp,v 1.6.6.2 2005/06/12 13:35:56 xleroy Exp $ *)
-
- (* Emission of Intel 386 assembly code *)
-
-@@ -35,8 +35,12 @@
- !contains_calls || num_stack_slots.(0) > 0 || num_stack_slots.(1) > 0
-
- let frame_size () = (* includes return address *)
-- let sz = (!stack_offset + 8 * (num_stack_slots.(0) + num_stack_slots.(1)) + 8)
-+ if frame_required() then begin
-+ let sz =
-+ (!stack_offset + 8 * (num_stack_slots.(0) + num_stack_slots.(1)) + 8)
- in Misc.align sz 16
-+ end else
-+ !stack_offset + 8
-
- let slot_offset loc cl =
- match loc with
Deleted: trunk/packages/ocaml/branches/3.08.4/debian/patches/fix_i386_gcc4_build.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/fix_i386_gcc4_build.dpatch 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/patches/fix_i386_gcc4_build.dpatch 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_i386_gcc4_build.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from upstream to fix build on i386 with gcc4.
-## DP: This is recorded as PR#3604 and PR#3637
-## DP: http://camlcvs.inria.fr/cgi-bin/cvsweb/ocaml/otherlibs/num/bng_ia32.c.diff?r1=1.3;r2=1.3.6.1
-
- at DPATCH@
-diff -urNad ocaml-3.08.3.orig/otherlibs/num/bng_ia32.c ocaml-3.08.3/otherlibs/num/bng_ia32.c
---- ocaml-3.08.3.orig/otherlibs/num/bng_ia32.c 2003-10-26 10:51:11.000000000 +0100
-+++ ocaml-3.08.3/otherlibs/num/bng_ia32.c 2005-06-20 17:34:10.015173470 +0200
-@@ -121,8 +121,8 @@
- "leal 4(%1), %1 \n\t"
- "decl %2 \n\t"
- "jnz 1b"
-- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&r" (out)
-- : "rm" (d)
-+ : "+&r" (a), "+&r" (b), "+&r" (blen), "=m" (out)
-+ : "m" (d)
- : "eax", "edx");
- }
- if (alen == 0) return out;
-@@ -164,8 +164,8 @@
- "leal 4(%1), %1 \n\t"
- "decl %2 \n\t"
- "jnz 1b"
-- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&rm" (out), "=&r" (tmp)
-- : "rm" (d)
-+ : "+&r" (a), "+&r" (b), "=m" (blen), "=m" (out), "=&r" (tmp)
-+ : "m" (d)
- : "eax", "edx");
- }
- if (alen == 0) return out;
Modified: trunk/packages/ocaml/branches/3.08.4/debian/patches/versioned_libdir.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/patches/versioned_libdir.dpatch 2005-08-31 20:55:08 UTC (rev 1725)
@@ -27,8 +27,8 @@
case "$libdir" in
- "") echo 'LIBDIR=$(PREFIX)/lib/camlp4' >> Makefile.cnf
- libdir="$prefix/lib/camlp4";;
-+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.08.3/camlp4' >> Makefile.cnf
-+ libdir="$prefix/lib/ocaml/3.08.3/camlp4";;
++ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.08.4/camlp4' >> Makefile.cnf
++ libdir="$prefix/lib/ocaml/3.08.4/camlp4";;
*) echo "LIBDIR=$libdir" >> Makefile.cnf;;
esac
case "$mandir" in
@@ -48,8 +48,8 @@
case "$libdir" in
- "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile
- libdir="$prefix/lib/ocaml";;
-+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.08.3' >> Makefile
-+ libdir="$prefix/lib/ocaml/3.08.3";;
++ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.08.4' >> Makefile
++ libdir="$prefix/lib/ocaml/3.08.4";;
*) echo "LIBDIR=$libdir" >> Makefile;;
esac
echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile
Modified: trunk/packages/ocaml/branches/3.08.4/debian/rules
===================================================================
--- trunk/packages/ocaml/trunk/debian/rules 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/rules 2005-08-31 20:55:08 UTC (rev 1725)
@@ -8,7 +8,7 @@
# We want to use dpatch.
include /usr/share/dpatch/dpatch.make
PACKAGE = ocaml
-VERSION = 3.08.3
+VERSION = 3.08.4
STDLIBDIR = /usr/lib/ocaml/$(VERSION)
MD5SUMSDIR = /var/lib/ocaml/md5sums
Modified: trunk/packages/ocaml/branches/3.08.4/debian/svn-deblayout
===================================================================
--- trunk/packages/ocaml/trunk/debian/svn-deblayout 2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/ocaml/branches/3.08.4/debian/svn-deblayout 2005-08-31 20:55:08 UTC (rev 1725)
@@ -1,3 +1,3 @@
-origDir=../upstream
+origDir=../../upstream
origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml/upstream
tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml
Added: trunk/packages/ocaml/upstream/ocaml_3.08.4.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/ocaml/upstream/ocaml_3.08.4.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list