[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 312/master, updated. debian/3.11.2-1-41-g18cf6cc

[Stephane Glondu]

The following commit has been merged in the 312/master branch:
commit 18cf6ccbe50f6b5ef52524a70905bea7a7335388
Merge: f406fc899016f19048788e2af5f849fefa99e195 eb02f6708d491a3efaec1abaed5f7313b0915370
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Dec 4 15:00:55 2010 +0100

    Merge 3.11.2-2 changelog entry

diff --combined debian/changelog
index e3bd648,ee44ffe..8de4c8f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,26 @@@
 +ocaml (3.12.0-1) UNRELEASED; urgency=low
 +
 +  [ Stéphane Glondu ]
 +  * 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-2) unstable; urgency=low
+ 
 +  [ Ralf Treinen ]
    * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el
      and inf-caml.el for xemacs21 (Closes: #508813, LP: #464587).
  
-  -- Stéphane Glondu <glondu at debian.org>  Sat, 24 Jul 2010 14:24:19 +0200
+  -- Mehdi Dogguy <mehdi at debian.org>  Tue, 05 Oct 2010 17:46:59 +0200
  
  ocaml (3.11.2-1) unstable; urgency=low
  

-- 
OCaml packaging