[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 312/master, updated. debian/3.11.2-4-38-gd05f9da

[Stephane Glondu]

The following commit has been merged in the 312/master branch:
commit d05f9da3abb6515494fd5790e72a608e1f35484f
Merge: a1b7cc7d4d4271868b4a6a347530c881a7ac8407 d989da940f771a0eb0c63033d3a3a6631604ac9a
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Mar 18 15:16:20 2011 +0100

    Merge commit 'debian/3.11.2-4' into 312/master

diff --combined debian/changelog
index 0c7315e,8343573..e84d3cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,15 +1,30 @@@
 +ocaml (3.12.0-1) UNRELEASED; urgency=low
 +
 +  * New upstream release (Closes: #255245, #570920)
 +    - add armel to native architectures; note that the Dynlink module is
 +      not available in native code there: software using it should take care
 +      of this new possibility
 +    - {add,scrape}labels are no longer installed
 +    - remove ocaml{byteinfo,plugininfo,dumpapprox}: all tools merged into
 +      ocamlobjinfo; add binutils-dev to Buid-Depends
 +  * debian/rules: switch to dh with overrides
 +  * Switch source package format to 3.0 (quilt)
 +  * Bump version in debhelper build-dependency (Closes: #562606)
 +
 + -- Stéphane Glondu <glondu at debian.org>  Sat, 24 Jul 2010 14:24:19 +0200
 +
+ ocaml (3.11.2-4) unstable; urgency=high
+ 
+   * Fix FTBFS on i386 due to a bug in previous patch
+ 
+  -- Stéphane Glondu <glondu at debian.org>  Wed, 09 Mar 2011 07:54:58 +0100
+ 
+ ocaml (3.11.2-3) unstable; urgency=high
+ 
+   * Add patch to fix ocamlopt w.r.t. binutils 2.21 (Closes: #617404)
+ 
+  -- Stéphane Glondu <glondu at debian.org>  Tue, 08 Mar 2011 21:32:54 +0100
+ 
  ocaml (3.11.2-2) unstable; urgency=low
  
    * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el

-- 
OCaml packaging