diff -Nru ocaml-4.02.3/debian/changelog ocaml-4.02.3/debian/changelog --- ocaml-4.02.3/debian/changelog 2015-10-20 11:41:11.000000000 +0200 +++ ocaml-4.02.3/debian/changelog 2015-10-29 20:49:31.000000000 +0100 @@ -1,3 +1,10 @@ +ocaml (4.02.3-5ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Pass --hash-style=both --as-needed --build-id to the linker. + + -- Łukasz 'sil2100' Zemczak Thu, 29 Oct 2015 20:48:14 +0100 + ocaml (4.02.3-5) unstable; urgency=medium * Fix ocamldoc with -pp (Closes: #802347) @@ -70,6 +77,13 @@ -- Stéphane Glondu Thu, 30 Oct 2014 09:28:06 +0100 +ocaml (4.01.0-4ubuntu1) utopic; urgency=medium + + * Merge with Debian; remaining changes: + - Pass --hash-style=both --as-needed --build-id to the linker. + + -- Matthias Klose Wed, 06 Aug 2014 10:37:45 +0200 + ocaml (4.01.0-4) unstable; urgency=medium * debian/patches: @@ -80,6 +94,25 @@ -- Stéphane Glondu Sat, 17 May 2014 15:26:14 +0200 +ocaml (4.01.0-3ubuntu3) trusty; urgency=medium + + * Rebuild for Tcl/Tk 8.6. + + -- Matthias Klose Thu, 02 Jan 2014 20:05:45 +0100 + +ocaml (4.01.0-3ubuntu2) trusty; urgency=medium + + * Disable the testsocket test, trying to reach the net. + + -- Matthias Klose Mon, 23 Dec 2013 00:07:52 +0100 + +ocaml (4.01.0-3ubuntu1) trusty; urgency=low + + * Merge with Debian; remaining changes: + - Pass --hash-style=both --as-needed --build-id to the linker. + + -- Matthias Klose Sun, 22 Dec 2013 11:13:10 +0100 + ocaml (4.01.0-3) unstable; urgency=low * Upload to unstable @@ -199,6 +232,14 @@ -- Stéphane Glondu Thu, 19 Apr 2012 09:04:28 +0200 +ocaml (3.12.1-4ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Pass --hash-style=both --as-needed --build-id to the linker. + - Add armhf to the ocaml-native-compilers architectures list. + + -- Adam Conrad Sat, 27 Apr 2013 12:45:36 -0600 + ocaml (3.12.1-4) unstable; urgency=low * Change the Debian-specific behaviour of -custom (Closes: #678577) @@ -223,6 +264,25 @@ -- Stéphane Glondu Mon, 14 May 2012 07:52:40 +0200 +ocaml (3.12.1-2ubuntu3) quantal; urgency=low + + * No-change rebuild against latest armel toolchain. + + -- Adam Conrad Fri, 27 Apr 2012 07:35:22 -0600 + +ocaml (3.12.1-2ubuntu2) precise; urgency=low + + * Build ocaml-native-compilers for armhf. + + -- Matthias Klose Mon, 05 Dec 2011 17:09:44 +0100 + +ocaml (3.12.1-2ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + - Pass --hash-style=both --as-needed --build-id to the linker. + + -- Matthias Klose Fri, 18 Nov 2011 18:55:13 +0100 + ocaml (3.12.1-2) unstable; urgency=low * Fix compilation on kfreebsd-any: do not add -R$dir in X11 link options @@ -250,6 +310,24 @@ -- Stéphane Glondu Tue, 01 Nov 2011 13:53:49 +0100 +ocaml (3.12.0-7ubuntu2) oneiric; urgency=low + + * Pass --hash-style=both --no-copy-dt-needed-entries --as-needed to the linker. + + -- Matthias Klose Mon, 15 Aug 2011 12:17:36 +0200 + +ocaml (3.12.0-7ubuntu1) oneiric; urgency=low + + * ocamlopt/arm: Add .type directive for code symbols. LP: #810402. + + -- Matthias Klose Sat, 13 Aug 2011 08:59:40 +0200 + +ocaml (3.12.0-7build1) oneiric; urgency=low + + * Rebuild with GCC-4.6. + + -- Matthias Klose Thu, 14 Jul 2011 14:56:21 +0200 + ocaml (3.12.0-7) unstable; urgency=low * Force aligned access for double and int64 on mips* @@ -2088,3 +2166,4 @@ * Added Debian GNU/Linux Linux package maintenance system files -- Christophe Le Bars Fri, 11 Oct 1996 22:25:01 +0200 + diff -Nru ocaml-4.02.3/debian/control ocaml-4.02.3/debian/control --- ocaml-4.02.3/debian/control 2015-10-20 11:28:06.000000000 +0200 +++ ocaml-4.02.3/debian/control 2015-10-20 18:11:38.000000000 +0200 @@ -1,7 +1,8 @@ Source: ocaml Section: ocaml Priority: optional -Maintainer: Debian OCaml Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OCaml Maintainers Uploaders: Samuel Mimram , Ralf Treinen , diff -Nru ocaml-4.02.3/debian/control.in ocaml-4.02.3/debian/control.in --- ocaml-4.02.3/debian/control.in 2015-10-20 11:28:06.000000000 +0200 +++ ocaml-4.02.3/debian/control.in 2015-10-20 18:11:37.000000000 +0200 @@ -1,7 +1,8 @@ Source: ocaml Section: ocaml Priority: optional -Maintainer: Debian OCaml Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OCaml Maintainers Uploaders: Samuel Mimram , Ralf Treinen , diff -Nru ocaml-4.02.3/debian/patches/linker-flags.patch ocaml-4.02.3/debian/patches/linker-flags.patch --- ocaml-4.02.3/debian/patches/linker-flags.patch 1970-01-01 01:00:00.000000000 +0100 +++ ocaml-4.02.3/debian/patches/linker-flags.patch 2014-08-06 10:41:10.000000000 +0200 @@ -0,0 +1,25 @@ +Index: ocaml-3.12.1/configure +=================================================================== +--- ocaml-3.12.1.orig/configure 2011-11-18 17:45:15.000000000 +0000 ++++ ocaml-3.12.1/configure 2011-11-18 17:54:51.104603036 +0000 +@@ -285,7 +285,9 @@ + if cc="$bytecc" sh ./hasgot -mieee; then + bytecccompopts="-mieee $bytecccompopts"; + fi +- bytecclinkopts="-Wl,--no-relax";; ++ bytecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id -Wl,--no-relax";; ++ gcc,*-*-linux*) ++ bytecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id";; + cc,mips-*-irix6*) + # Add -n32 flag to ensure compatibility with native-code compiler + bytecccompopts="-n32" +@@ -740,7 +742,8 @@ + nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; + *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" + if $arch64; then partialld="ld -r -arch ppc64"; fi;; +- alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax";; ++ alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id -Wl,--no-relax";; ++ *,gcc*,linux*,*) nativecclinkopts="-Wl,--hash-style=both -Wl,--as-needed -Wl,--build-id";; + *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; + amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; + amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";; diff -Nru ocaml-4.02.3/debian/patches/series ocaml-4.02.3/debian/patches/series --- ocaml-4.02.3/debian/patches/series 2015-10-20 11:39:09.000000000 +0200 +++ ocaml-4.02.3/debian/patches/series 2015-10-29 20:45:39.000000000 +0100 @@ -8,3 +8,4 @@ 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch 0010-Enable-ocamldoc-to-build-reproducible-manpages.patch 0010-Add-a-.file-directive-to-generated-.s-files.patch +linker-flags.patch