Update patches, versions, and changelog

diff --git a/debian/changelog b/debian/changelog
index db2880e0402dc0b514dbbee38c9fb5c9795070ae..e90f8d8c40593941f16867621403c0a88385201a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-ocaml (4.03.0-6) UNRELEASED; urgency=medium
+ocaml (4.04.0-1) UNRELEASED; urgency=medium
 
+  [ Mehdi Dogguy ]
   * Use secure and canonical URIs for Vcs-* fields
 
- -- Mehdi Dogguy <mehdi@debian.org>  Sun, 06 Nov 2016 11:01:52 +0100
+  [ Ximin Luo ]
+  * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org>  Sun, 06 Nov 2016 19:58:56 +0100
 
 ocaml (4.03.0-5) experimental; urgency=medium
 

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 eca7bc2394d71b9530b5d0bbc099a789a43d7d91..63c6de48fea8719839456fe7f9dc19f14e108f09 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
@@ -10,7 +10,7 @@ code (bug#338437)
 
 --- a/configure
 +++ b/configure
-@@ -374,7 +374,8 @@
+@@ -401,7 +401,8 @@
    *gcc*,alpha*-*-linux*)
      if cc="$bytecc" sh ./hasgot -mieee; then
        bytecccompopts="-mieee $bytecccompopts";
@@ -20,7 +20,7 @@ code (bug#338437)
    *,mips-*-irix6*)
      # Turn off warning "unused library"
      bytecclinkopts="-n32 -Wl,-woff,84";;
-@@ -893,6 +894,7 @@
+@@ -922,6 +923,7 @@
  case "$arch,$nativecc,$system,$model" in
    *,*,nextstep,*)      nativecclinkopts="-posix";;
    *,*,rhapsody,*)      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 3871b93f211f69260da029e2bbcd8b1b94176a49..b965f8a651ec7f267eac14dcf471c4ba1273fbbe 100644 (file)
--- a/debian/patches/0002-Call-ld-with-proper-flags.patch
+++ b/debian/patches/0002-Call-ld-with-proper-flags.patch
@@ -11,7 +11,7 @@ gcc.
 
 --- a/configure
 +++ b/configure
-@@ -1782,7 +1782,7 @@
+@@ -1946,7 +1946,7 @@
  echo "CC_PROFILE=$cc_profile" >> Makefile
  echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
  echo "PARTIALLD=$partialld" >> Makefile

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 bdb2ae0d53b4eecfa30f87051140dede6605451f..7cfffa68114ec304325ea9c07054056dfdb75cea 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
@@ -8,7 +8,7 @@ Subject: Put manpages in section 3o instead of 3
 
 --- a/ocamldoc/Makefile
 +++ b/ocamldoc/Makefile
-@@ -328,7 +328,7 @@
+@@ -320,7 +320,7 @@
  stdlib_man/Pervasives.3o: $(STDLIB_MLIS)
        $(MKDIR) stdlib_man
        $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \

diff --git a/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
index 511ddb7f4e5fceacd4c7ca02292c6ed6d8f3a251..537bb509af98e370c98fc687751169217557df79 100644 (file)
--- a/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+++ b/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
@@ -20,7 +20,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
 
 --- a/bytecomp/bytelink.ml
 +++ b/bytecomp/bytelink.ml
-@@ -440,6 +440,20 @@
+@@ -449,6 +449,20 @@
      remove_file outfile;
      raise x
  
@@ -41,7 +41,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  (* Output a bytecode executable as a C file *)
  
  let link_bytecode_as_c ppf tolink outfile =
-@@ -482,7 +496,7 @@
+@@ -491,7 +505,7 @@
        (Marshal.to_string sections []);
      output_string outchan "\n};\n\n";
      (* The table of primitives *)
@@ -50,7 +50,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
      (* The entry point *)
      output_string outchan "\
  \nvoid caml_startup(char ** argv)\
-@@ -563,7 +577,7 @@
+@@ -580,7 +594,7 @@
          #else\n\
          typedef long value;\n\
          #endif\n";

diff --git a/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
index b1f59832d691bed809202d6241bd0f74767f227d..d29ef9a3c8ac82af48c856c2df61717892bb2027 100644 (file)
--- a/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
+++ b/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
@@ -23,7 +23,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
 
 --- a/bytecomp/bytelink.ml
 +++ b/bytecomp/bytelink.ml
-@@ -456,7 +456,7 @@
+@@ -465,7 +465,7 @@
  
  (* Output a bytecode executable as a C file *)
  
@@ -32,7 +32,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
    let outchan = open_out outfile in
    begin try
      (* The bytecode *)
-@@ -498,14 +498,27 @@
+@@ -507,14 +507,27 @@
      (* The table of primitives *)
      Symtable.output_primitive_table outchan mlvalues_primitives;
      (* The entry point *)
@@ -62,7 +62,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  \n#ifdef __cplusplus\
  \n}\
  \n#endif\n";
-@@ -544,6 +557,17 @@
+@@ -553,6 +566,17 @@
        if String.contains name '.' then name else name ^ ".exe"
    | _ -> name
  
@@ -80,7 +80,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  (* Main entry point (build a custom runtime if needed) *)
  
  let link ppf objfiles output_name =
-@@ -558,6 +582,16 @@
+@@ -575,6 +599,16 @@
    Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *)
    if not !Clflags.custom_runtime then
      link_bytecode ppf tolink output_name true
@@ -97,7 +97,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
    else if not !Clflags.output_c_object then begin
      let bytecode_name = Filename.temp_file "camlcode" "" in
      let prim_name = Filename.temp_file "camlprim" ".c" in
-@@ -607,7 +641,7 @@
+@@ -624,7 +658,7 @@
      if Sys.file_exists c_file then raise(Error(File_exists c_file));
      let temps = ref [] in
      try

diff --git a/debian/patches/0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch b/debian/patches/0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch
index c9d2e12da33770feb2060fe7bed0f81d2a256cd2..7734fcbc8ec37e8ca02685617c6dca3caa7e9308 100644 (file)
--- a/debian/patches/0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch
+++ b/debian/patches/0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch
@@ -8,7 +8,7 @@ Subject: Native backtraces don't work on powerpc and sparc
 
 --- a/testsuite/tests/backtrace/Makefile
 +++ b/testsuite/tests/backtrace/Makefile
-@@ -24,7 +24,10 @@
+@@ -29,7 +29,10 @@
  
  default:
        @$(MAKE) byte

diff --git a/debian/patches/0009-Skip-native-tests.patch b/debian/patches/0009-Skip-native-tests.patch
index a265799b8f31e69d01e403af8157bf9d5ffb5188..c74fd6c55a88fff1df923fec6ef1b3225a752a59 100644 (file)
--- a/debian/patches/0009-Skip-native-tests.patch
+++ b/debian/patches/0009-Skip-native-tests.patch
@@ -1,6 +1,6 @@
 --- a/testsuite/tests/lib-dynlink-csharp/Makefile
 +++ b/testsuite/tests/lib-dynlink-csharp/Makefile
-@@ -30,7 +30,9 @@
+@@ -31,7 +31,9 @@
  prepare:
        @if $(SUPPORTS_SHARED_LIBRARIES); then \
           $(OCAMLC) -c plugin.ml && \
@@ -13,17 +13,18 @@
  .PHONY: bytecode
 --- a/testsuite/tests/link-test/Makefile
 +++ b/testsuite/tests/link-test/Makefile
-@@ -15,6 +15,13 @@
+@@ -14,7 +14,13 @@
+ #*                                                                        *
  #**************************************************************************
  
- default:
+-default: byte native
++default:
++      @$(MAKE) byte
 +      @if $(BYTECODE_ONLY) ; then \
 +        echo " ... testing 'test.reference': => skipped"; \
 +      else \
 +        $(MAKE) native; \
 +      fi
-+
-+native:
-       printf " ... testing 'test.reference':"
-       @$(OCAMLOPT) -c submodule.ml
-       @$(OCAMLOPT) -c aliases.ml
+ 
+ native:
+       @printf " ... testing native 'test.reference':"

diff --git a/debian/patches/0010-arm-default-PIC.patch b/debian/patches/0010-arm-default-PIC.patch
index 6f613c13e1e8d98b45f51cbb3d65ba15957d7fc7..9480339ac96a07526b427c1602b6f708cf6568cd 100644 (file)
--- a/debian/patches/0010-arm-default-PIC.patch
+++ b/debian/patches/0010-arm-default-PIC.patch
@@ -7,7 +7,7 @@ Forwarded: TODO
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/utils/clflags.ml
 +++ b/utils/clflags.ml
-@@ -146,6 +146,7 @@
+@@ -147,6 +147,7 @@
  
  let pic_code = ref (match Config.architecture with (* -fPIC *)
                       | "amd64" -> true
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  let runtime_variant = ref "";;      (* -runtime-variant *)
 --- a/man/ocamlopt.m
 +++ b/man/ocamlopt.m
-@@ -682,10 +682,10 @@
+@@ -702,10 +702,10 @@
  Select the floating-point hardware
  .TP
  .B \-fPIC

diff --git a/debian/rules b/debian/rules
index e4184276b4df1590f0b173a47da05c6cdf4f91f6..053cf10a848595a3ac77074920f799c0674a2307 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 PACKAGE := ocaml
 ALL_PACKAGES := $(shell dh_listpackages)
-OCAMLMAJOR := 4.03
+OCAMLMAJOR := 4.04
 OCAMLMINOR := 0
 
 # Build cache (for Debian debugging)