[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/3.11.1-5-14-g9141e85

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit 9141e8526acf3826cdcf75a50bd208b89d920eea
Merge: de541bf07c894940924ec85cc78ab2de188189e0 86467cd89eb5f337f90cfed336731ed9802b2c6c
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jan 20 18:33:28 2010 +0100

    Merge branch 'master' into experimental/master
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index d8ca43f,80e56cf..ce93e17
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,4 +1,7 @@@
 -ocaml (3.11.1-6) UNRELEASED; urgency=low
 +ocaml (3.11.2-1) UNRELEASED; urgency=low
 +
 +  [ Stéphane Glondu ]
 +  * New upstream release
  
    [ Mehdi Dogguy ]
    * camlp4-extra:
@@@ -12,7 -9,10 +12,10 @@@
    * debian/control:
      - Make camlp4-extra depend on ocaml-base-nox
  
+   [ Ralf Treinen ]
+   * debian/control.in: bump dependency of ocaml-mode on emacs22 to emacs23.
+ 
 - -- Ralf Treinen <treinen at debian.org>  Sat, 02 Jan 2010 13:42:30 +0100
 + -- Stéphane Glondu <glondu at debian.org>  Wed, 20 Jan 2010 18:32:10 +0100
  
  ocaml (3.11.1-5) unstable; urgency=low
  

-- 
OCaml packaging