New upstream snapshot

diff --git a/debian/changelog b/debian/changelog
index e2716a6ff4f1274de121619f49127609f838aa00..2cb2867509531b1102e111c8b8e8cd8c26c7f33e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
-ocaml (3.11.2-2) UNRELEASED; urgency=low
+ocaml (3.12.0~0dev17+10268-1) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
+  * New upstream snapshot
+
+  [ Ralf Treinen ]
   * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el
     and inf-caml.el for xemacs21 (Closes: #508813, LP: #464587).
 

diff --git a/debian/ocaml-base-nox.install.in b/debian/ocaml-base-nox.install.in
index a5a385107469eeff878087167a4ea43a34fac525..03e26767fb2461537b6286bf71dd4b8031d658a1 100644 (file)
--- a/debian/ocaml-base-nox.install.in
+++ b/debian/ocaml-base-nox.install.in
@@ -2,7 +2,7 @@
      usr/share/man/man1/ocamlrun.1
      toplevel/*.mli @OCamlStdlibDir@
      @OCamlDllDir@/dllunix.so
-     @OCamlDllDir@/dllstr.so
+     @OCamlDllDir@/dllcamlstr.so
      @OCamlDllDir@/dllbigarray.so
      @OCamlDllDir@/dllthreads.so
      @OCamlDllDir@/dllvmthreads.so

diff --git a/debian/ocaml-base.install.in b/debian/ocaml-base.install.in
index dc0191bb1c55e70e16181ba0f1a3d8d546a2ee84..ed87d092370b4b3b936f5ba0fe650c59de96ad60 100644 (file)
--- a/debian/ocaml-base.install.in
+++ b/debian/ocaml-base.install.in
@@ -1,5 +1,4 @@
      @OCamlDllDir@/dlllabltk.so
      @OCamlDllDir@/dllgraphics.so
-     @OCamlDllDir@/dlltkanim.so
      @OCamlStdlibDir@/graphics.cma
 OPT: @OCamlStdlibDir@/graphics.cmxs

diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index 1288e419eee9cd1c9830af8ff0fdc4cc1052520f..df89d288584ca6c1263191b5036bf390f18775f4 100644 (file)
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -35,7 +35,7 @@ OPT: @OCamlStdlibDir@/libasmrunp.a
      @OCamlStdlibDir@/libcamlrun_shared.so
      @OCamlStdlibDir@/libmldbm.a
      @OCamlStdlibDir@/libnums.a
-     @OCamlStdlibDir@/libstr.a
+     @OCamlStdlibDir@/libcamlstr.a
      @OCamlStdlibDir@/libthreads.a
 OPT: @OCamlStdlibDir@/libthreadsnat.a
      @OCamlStdlibDir@/libunix.a

diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
index 0ab6e424e5b0c838f13c46df7a66d0b1aba283ab..cd019d71803880180c61854b6d56d0280e98fd9b 100644 (file)
--- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
+++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
@@ -9,10 +9,10 @@ code (bug#338437)
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 166ceaf..0327f64 100755
+index 40a89e8..bdfdfdd 100755
 --- a/configure
 +++ b/configure
-@@ -282,7 +282,8 @@ case "$bytecc,$host" in
+@@ -284,7 +284,8 @@ case "$bytecc,$host" in
    gcc,alpha*-*-linux*)
      if cc="$bytecc" sh ./hasgot -mieee; then
        bytecccompopts="-mieee $bytecccompopts";
@@ -22,7 +22,7 @@ index 166ceaf..0327f64 100755
    cc,mips-*-irix6*)
      # Add -n32 flag to ensure compatibility with native-code compiler
      bytecccompopts="-n32"
-@@ -693,6 +694,7 @@ case "$arch,$nativecc,$system,$host_type" in
+@@ -697,6 +698,7 @@ case "$arch,$nativecc,$system,$host_type" in
                         nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
    *,*,rhapsody,*)      nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
                         if $arch64; then partialld="ld -r -arch ppc64"; fi;;

diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch
index c88102f7a4c1e35108e640c7cddf0e50cba012f6..b99295afd1641c9cf7f0c43a6714eabfdb18d02b 100644 (file)
--- a/debian/patches/0002-Call-ld-with-proper-flags.patch
+++ b/debian/patches/0002-Call-ld-with-proper-flags.patch
@@ -10,16 +10,16 @@ gcc.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 0327f64..1d0d767 100755
+index bdfdfdd..020efed 100755
 --- a/configure
 +++ b/configure
-@@ -1566,7 +1566,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1586,7 +1586,7 @@ echo "DEBUGGER=$debugger" >> Makefile
  echo "CC_PROFILE=$cc_profile" >> Makefile
  echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
  echo "PARTIALLD=$partialld" >> Makefile
--echo "PACKLD=\$(PARTIALLD) \$(NATIVECCLINKOPTS) -o " >> Makefile
-+echo "PACKLD=\$(PARTIALLD) $(echo $nativecclinkopts|sed s/-Wl,//g) -o " >> Makefile
+-echo "PACKLD=\$(PARTIALLD) \$(NATIVECCLINKOPTS) -o " \
++echo "PACKLD=\$(PARTIALLD) $(echo $nativecclinkopts|sed s/-Wl,//g) -o " \
+   | sed -e 's/ $/\\ /' >> Makefile
  echo "DLLCCCOMPOPTS=$dllccompopts" >> Makefile
  echo "IFLEXDIR=$iflexdir" >> Makefile
- echo "O=o" >> Makefile
 -- 

diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch
index 11bfba431d0087ed3bbe63c229883141a8af7967..a690a33b397a2f4ecb769e0cffb3e38ce894bc57 100644 (file)
--- a/debian/patches/0003-Don-t-use-rpath.patch
+++ b/debian/patches/0003-Don-t-use-rpath.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Don't use rpath
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp
-index cec4877..4db288f 100644
+index 80c1d9f..b6ed47a 100644
 --- a/tools/ocamlmklib.mlp
 +++ b/tools/ocamlmklib.mlp
-@@ -32,6 +32,11 @@ and output_c = ref ""       (* Output name for C part of library *)
+@@ -37,6 +37,11 @@ and output_c = ref ""       (* Output name for C part of library *)
  and rpath = ref []          (* rpath options *)
  and verbose = ref false
  

diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
index 19aaa0d86f2fa10cb6da89cdc69f2e2e30739f28..fdc14a623dacc337ffbccc51864d8d5c1504ed14 100644 (file)
--- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
+++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Put manpages in section 3o instead of 3
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
-index 66f9fdd..45476ec 100644
+index a9ce895..0673c56 100644
 --- a/ocamldoc/Makefile
 +++ b/ocamldoc/Makefile
 @@ -319,7 +319,7 @@ test_texi: dummy

diff --git a/debian/patches/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch
index 33885cee1d763b1eb6d81b9c4ce39872152ab757..fbef3aaea53314dbe74e35e56aff68797473dba4 100644 (file)
--- a/debian/patches/0005-Patch-config.sh-for-installation.patch
+++ b/debian/patches/0005-Patch-config.sh-for-installation.patch
@@ -9,7 +9,7 @@ Use for installatation a patched config.sh (created by debian/rules).
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/build/install.sh b/build/install.sh
-index 5093f31..d4f5804 100755
+index 2197069..901964b 100755
 --- a/build/install.sh
 +++ b/build/install.sh
 @@ -18,7 +18,7 @@ set -e
@@ -22,7 +22,7 @@ index 5093f31..d4f5804 100755
  not_installed=$PWD/_build/not_installed
  
 diff --git a/build/partial-install.sh b/build/partial-install.sh
-index 7240fff..ea55334 100755
+index 6199762..a88e668 100755
 --- a/build/partial-install.sh
 +++ b/build/partial-install.sh
 @@ -22,7 +22,7 @@ set -e

diff --git a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
index e20fa972bb73b72e26b7d1528781061d561e43ce..39cb0adf8df14d537518d7e64b324d086219bb86 100644 (file)
--- a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
+++ b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Install ocamlbuild as a link on either .native or .byte
  1 files changed, 16 insertions(+), 1 deletions(-)
 
 diff --git a/build/partial-install.sh b/build/partial-install.sh
-index ea55334..a0a0028 100755
+index a88e668..a22da2c 100755
 --- a/build/partial-install.sh
 +++ b/build/partial-install.sh
 @@ -60,6 +60,21 @@ installbestbin() {

diff --git a/debian/patches/0007-Set-version-number.patch b/debian/patches/0007-Set-version-number.patch
new file mode 100644 (file)
index 0000000..deca529
--- /dev/null
+++ b/debian/patches/0007-Set-version-number.patch
@@ -0,0 +1,19 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Sun, 18 Apr 2010 15:12:10 +0200
+Subject: [PATCH] Set version number
+
+---
+ VERSION |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/VERSION b/VERSION
+index 9d186bd..1e53d7b 100644
+--- a/VERSION
++++ b/VERSION
+@@ -1,4 +1,4 @@
+-3.12.0+dev17 (2010-01-20)
++3.12.0+dev17+10268
+ 
+ # The version string is the first line of this file.
+ # It must be in the format described in stdlib/sys.mli
+-- 

diff --git a/debian/patches/series b/debian/patches/series
index e66568a4fbbf4f3d8c45241eccab9c6ad1412a66..507f0c298860fd59c5bbd2ccee73188d7beb9ee1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Put-manpages-in-section-3o-instead-of-3.patch
 0005-Patch-config.sh-for-installation.patch
 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
+0007-Set-version-number.patch

diff --git a/debian/rules b/debian/rules
index a450c8eec859bd1944419b7b16508ceeba37b546..659f0a2deb8ab297d79f88339b9326e8f457f36a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,8 @@ include /usr/share/quilt/quilt.make
 
 PACKAGE := ocaml
 ALL_PACKAGES := $(shell sed -ne 's/^Package: //p' debian/control)
-OCAMLMAJOR := 3.11
-OCAMLMINOR := 2
+OCAMLMAJOR := 3.12
+OCAMLMINOR := 0+dev17+10268
 
 # Build cache (for Debian debugging)
 BUILDCACHE := $(wildcard ../ocaml.cache)