[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-2-12-g11a1ff5
The following commit has been merged in the experimental/master branch: commit 02b757e24e38f81501322241652f3de6e40aa32b Merge: 908fe5f4e25fedb103a74a9e1f44252df9c2948e b96287d44838b8338a0aee56481546bf9374354f Author: Stephane Glondu st...@glondu.net Date: Sat Jul 21 14:36:47 2012 +0200 Merge tag 'upstream/4.00.0_rc1' into experimental/master Upstream version 4.00.0~rc1 -- OCaml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-2-12-g11a1ff5
The following commit has been merged in the experimental/master branch: commit 552b8b5ae9081eee6b2be9927d6fd5aeb3ffd4d5 Author: Stephane Glondu st...@glondu.net Date: Sat Jul 21 14:37:13 2012 +0200 New upstream release candidate diff --git a/debian/changelog b/debian/changelog index 127268c..007d764 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (4.00.0~rc1-1) UNRELEASED; urgency=low + + * New upstream release candidate + + -- Stéphane Glondu glo...@debian.org Sat, 21 Jul 2012 14:37:03 +0200 + ocaml (4.00.0~beta2-2) experimental; urgency=low * Fix natdynlink detection on sparc -- OCaml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-2-12-g11a1ff5
The following commit has been merged in the experimental/master branch: commit 8cc09d9279c35fad3422169e6ddbc9dc78f3a3e1 Author: Stephane Glondu st...@glondu.net Date: Sat Jul 21 15:09:59 2012 +0200 Update ABI diff --git a/debian/rules b/debian/rules index 115be8e..7014c4b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ PACKAGE := ocaml ALL_PACKAGES := $(shell dh_listpackages) OCAMLMAJOR := 4.00 -OCAMLMINOR := 0+beta2 +OCAMLMINOR := 0+rc1 # Build cache (for Debian debugging) BUILDCACHE := $(wildcard ../ocaml.cache) -- OCaml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-2-12-g11a1ff5
The following commit has been merged in the experimental/master branch: commit a1814977d637ccb7748bd8b13dcebfa8d32a Author: Stephane Glondu st...@glondu.net Date: Sat Jul 21 14:42:47 2012 +0200 Refresh patches 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 cb52739..f9ef8a2 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,7 +9,7 @@ code (bug#338437) 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 72f4240..cbb6491 100755 +index e08bbce..c95424e 100755 --- a/configure +++ b/configure @@ -299,7 +299,8 @@ case $bytecc,$host in @@ -22,7 +22,7 @@ index 72f4240..cbb6491 100755 cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts=-n32 -@@ -733,6 +734,7 @@ case $arch,$nativecc,$system,$host_type in +@@ -734,6 +735,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 3444c14..90cae41 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -10,10 +10,10 @@ gcc. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index cbb6491..afca5b0 100755 +index c95424e..20f7977 100755 --- a/configure +++ b/configure -@@ -1615,7 +1615,7 @@ echo DEBUGGER=$debugger Makefile +@@ -1619,7 +1619,7 @@ echo DEBUGGER=$debugger Makefile echo CC_PROFILE=$cc_profile Makefile echo SYSTHREAD_SUPPORT=$systhread_support Makefile echo PARTIALLD=$partialld Makefile diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch index a8c4a57..02855e5 100644 --- a/debian/patches/0003-Don-t-use-rpath.patch +++ b/debian/patches/0003-Don-t-use-rpath.patch @@ -7,10 +7,10 @@ Subject: Don't use rpath 1 file changed, 5 insertions(+) diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp -index f114b13..d3f359d 100644 +index b6c236e..b491fdd 100644 --- a/tools/ocamlmklib.mlp +++ b/tools/ocamlmklib.mlp -@@ -37,6 +37,11 @@ and output_c = ref(* Output name for C part of library *) +@@ -38,6 +38,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 70896f6..17ede18 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,10 +7,10 @@ Subject: Put manpages in section 3o instead of 3 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index b9dd690..679973b 100644 +index 74c82d3..1ef43b3 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile -@@ -342,7 +342,7 @@ test_texi: dummy +@@ -344,7 +344,7 @@ test_texi: dummy stdlib_man/Pervasives.3o: $(STDLIB_MLIS) $(MKDIR) stdlib_man $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \ diff --git a/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch similarity index 99% rename from debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch rename to debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch index df1e5c7..8d857f4 100644 --- a/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch +++ b/debian/patches/0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch @@ -61,7 +61,7 @@ index f40e425..bb14de6 100644 #ifdef __cplusplus\n\ }\n\ diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml -index 60c884e..08af10f 100644 +index 7ab4bfd..3f4495e 100644 --- a/bytecomp/symtable.ml +++ b/bytecomp/symtable.ml @@ -115,15 +115,17 @@ let output_primitive_names outchan = diff --git a/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch b/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch deleted file mode 100644 index 0487ef2..000 --- a/debian/patches/0007-Natdynlink-works-on-powerpc-hurd-i386-and-sparc.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Stephane Glondu st...@glondu.net -Date: Thu, 21 Jun 2012 13:35:22 +0200 -Subject: Natdynlink works on powerpc, hurd-i386 and sparc - -Rationale: ssreflect used to work with natdynlink there with ocaml
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-2-12-g11a1ff5
The following commit has been merged in the experimental/master branch: commit 11a1ff59b7ec8680c74018a92611c329af3be701 Author: Stephane Glondu st...@glondu.net Date: Sat Jul 21 15:42:15 2012 +0200 Update changelog and prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index de3352a..9aa44ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -ocaml (4.00.0~rc1-1) UNRELEASED; urgency=low +ocaml (4.00.0~rc1-1) experimental; urgency=low * New upstream release candidate + * Merge changes from 3.12.1-4 - -- Stéphane Glondu glo...@debian.org Sat, 21 Jul 2012 14:37:03 +0200 + -- Stéphane Glondu glo...@debian.org Sat, 21 Jul 2012 15:42:10 +0200 ocaml (4.00.0~beta2-2) experimental; urgency=low -- OCaml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-2-12-g11a1ff5
The following commit has been merged in the experimental/master branch: commit d0dd1b724156a0dc0867dcc2343d0277c12c8c06 Merge: 8cc09d9279c35fad3422169e6ddbc9dc78f3a3e1 560bdc6a5d31582c4330f60a81be69b196c27b1a Author: Stephane Glondu st...@glondu.net Date: Sat Jul 21 15:13:51 2012 +0200 Merge branch 'master' into experimental/master Conflicts: patch for Debian-specific behaviour of -custom diff --combined debian/changelog index 007d764,24fb792..de3352a --- a/debian/changelog +++ b/debian/changelog @@@ -1,53 -1,9 +1,59 @@@ +ocaml (4.00.0~rc1-1) UNRELEASED; urgency=low + + * New upstream release candidate + + -- Stéphane Glondu glo...@debian.org Sat, 21 Jul 2012 14:37:03 +0200 + +ocaml (4.00.0~beta2-2) experimental; urgency=low + + * Fix natdynlink detection on sparc + * Cherry-pick an upstream fix in native compilation on powerpc + * Fixes in the test suite: +- use legacy -custom for lib-marshal test +- some tests were still triggering ocamlopt even on bytecode +- fix asmcomp tests on powerpc +- fix symbol mangling in asmcomp tests on kfreebsd-i386 and sparc + * Bump Standards-Version to 3.9.3 + + -- Stéphane Glondu glo...@debian.org Thu, 21 Jun 2012 16:42:25 +0200 + +ocaml (4.00.0~beta2-1) experimental; urgency=low + + * New upstream beta release +- new R parameter in OCAMLRUNPARAMS to enable automatic + randomization of the generic hash function (Closes: #659149, + CVE-2012-0839) +- the layout of the ocaml-compiler-libs binary package has changed + significantly as a result of upstream installing +compiler-libs by + itself; toplevel libraries have been moved there + * Change the layout of the ocaml-source binary package + * Merge changes from version 3.12.1-3 + + -- Stéphane Glondu glo...@debian.org Wed, 13 Jun 2012 22:38:41 +0200 + +ocaml (4.00.0~~dev15+12379-1) experimental; urgency=low + + * New upstream snapshot, based on the 4.00 upstream branch +- partially revert r12328 to avoid FTBFS +- the dbm bindings have been removed upstream and are now released + separately +- declare armel and armhf as native architectures supporting + natdynlink + * Run the test-suite +- on kfreebsd-*, skip lib-thread tests (they hang and I am not able + to reproduce it myself) +- on slow architectures, skip some tests that take too much time +- fix asmcomp tests on Hurd (Closes: #661716) +- fix embedded test broken by our -custom behaviour + + -- Stéphane Glondu glo...@debian.org Thu, 19 Apr 2012 09:04:28 +0200 + + ocaml (3.12.1-4) unstable; urgency=low + + * Change the Debian-specific behaviour of -custom (Closes: #678577) + + -- Stéphane Glondu glo...@debian.org Tue, 26 Jun 2012 21:39:18 +0200 + ocaml (3.12.1-3) unstable; urgency=low [ Hendrik Tews ] diff --combined debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch index d5224a1,000..33539b6 mode 100644,00..100644 --- a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch +++ b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch @@@ -1,126 -1,0 +1,133 @@@ +From: Stephane Glondu st...@glondu.net - Date: Tue, 19 Jun 2012 09:57:08 +0200 ++Date: Sat, 21 Jul 2012 15:40:52 +0200 +Subject: Embed bytecode in C object when using -custom + +This patch fixes non-strippability of bytecode executables linked with - custom runtime. Having c in OCAML_COMPAT environment variable - restores the original behaviour. ++custom runtime. The new behaviour is enabled when OCAML_CUSTOM_EMBED ++is set to y, or when DEB_HOST_ARCH is non-empty. + +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761 ++Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577 +Signed-off-by: Stephane Glondu st...@glondu.net +--- - bytecomp/bytelink.ml | 36 ++ ++ bytecomp/bytelink.ml | 42 ++ + testsuite/tests/embedded/Makefile|3 +++ + testsuite/tests/lib-marshal/Makefile |3 +++ - 3 files changed, 38 insertions(+), 4 deletions(-) ++ 3 files changed, 44 insertions(+), 4 deletions(-) + +diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml - index bb14de6..ec02825 100644 ++index bb14de6..9922bf2 100644 +--- a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml +@@ -423,7 +423,7 @@ let mlvalues_primitives = [ + + (* Output a bytecode executable as a C file *) + +-let link_bytecode_as_c ppf tolink outfile = ++let link_bytecode_as_c ppf tolink outfile with_main = + let outchan = open_out outfile in + begin try + (* The bytecode *) +@@ -465,14 +465,27 @@ let link_bytecode_as_c ppf tolink outfile = + (* The table of primitives *) + Symtable.output_primitive_table outchan mlvalues_primitives; +
