From b9eaf5135c18f41ec36bd405456dba742b4598f9 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sun, 18 Apr 2010 14:18:38 +0200 Subject: [PATCH] New upstream snapshot --- debian/changelog | 6 +++++- debian/ocaml-base-nox.install.in | 2 +- debian/ocaml-base.install.in | 1 - debian/ocaml-nox.install.in | 2 +- .../0001-Pass-no-relax-to-ld-on-alpha.patch | 6 +++--- .../0002-Call-ld-with-proper-flags.patch | 10 +++++----- debian/patches/0003-Don-t-use-rpath.patch | 4 ++-- ...-manpages-in-section-3o-instead-of-3.patch | 2 +- ...005-Patch-config.sh-for-installation.patch | 4 ++-- ...ld-as-a-link-on-either-.native-or-.b.patch | 2 +- debian/patches/0007-Set-version-number.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 ++-- 13 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 debian/patches/0007-Set-version-number.patch diff --git a/debian/changelog b/debian/changelog index e2716a6f..2cb28675 100644 --- 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 a5a38510..03e26767 100644 --- 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 dc0191bb..ed87d092 100644 --- 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 1288e419..df89d288 100644 --- 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 0ab6e424..cd019d71 100644 --- 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 c88102f7..b99295af 100644 --- 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 11bfba43..a690a33b 100644 --- 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 19aaa0d8..fdc14a62 100644 --- 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 33885cee..fbef3aae 100644 --- 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 e20fa972..39cb0adf 100644 --- 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 index 00000000..deca5293 --- /dev/null +++ b/debian/patches/0007-Set-version-number.patch @@ -0,0 +1,19 @@ +From: Stephane Glondu +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 e66568a4..507f0c29 100644 --- 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 a450c8ee..659f0a2d 100755 --- 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) -- 2.30.2