[Pkg-ocaml-maint-commits] [ocaml] 01/01: Merge tag 'debian/4.01.0-5' into experimental/master

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch experimental/master
in repository ocaml.

commit 6b95e8ea5efaf7473d3778318711dac4e56013ca
Merge: eb28412 cd365b5
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Oct 30 11:07:50 2014 +0100

    Merge tag 'debian/4.01.0-5' into experimental/master
    
    ocaml Debian release 4.01.0-5
    
    Conflicts:
    	debian/changelog

 debian/changelog                 | 10 ++++++++++
 debian/control                   |  2 +-
 debian/ocaml-mode.emacsen-compat |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 1239b6f,7e9bae8..3acf97a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,12 +1,27 @@@
 +ocaml (4.02.1-2) UNRELEASED; urgency=medium
 +
 +  * Disable endianness-dependent tests
 +  * Add arm64 to native architectures
++  * Merge version 4.01.0-5
 +
 + -- Stéphane Glondu <glondu at debian.org>  Tue, 28 Oct 2014 09:44:33 +0100
 +
 +ocaml (4.02.1-1) experimental; urgency=medium
 +
 +  * New upstream release
 +    - camlp4 and labltk are now distributed separately
 +
 + -- Stéphane Glondu <glondu at debian.org>  Tue, 21 Oct 2014 17:31:42 +0200
 +
+ ocaml (4.01.0-5) unstable; urgency=medium
+ 
+   [ Ralf Treinen ]
+   * ocaml-mode: change dependency on emacs23 to emacs (closes: #754021)
+   * ocaml-mode: add versionend dependency on emacs-common, add a file
+     ocaml-mode.emacsen-compat (closes: #749311)
+ 
+  -- Stéphane Glondu <glondu at debian.org>  Thu, 30 Oct 2014 09:28:06 +0100
+ 
  ocaml (4.01.0-4) unstable; urgency=medium
  
    * debian/patches:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git