From: Stephane Glondu <steph@glondu.net>
Date: Thu, 30 Oct 2014 10:07:50 +0000 (+0100)
Subject: Merge tag 'debian/4.01.0-5' into experimental/master
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~162
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b95e8ea5efaf7473d3778318711dac4e56013ca;p=ocaml.git

Merge tag 'debian/4.01.0-5' into experimental/master

ocaml Debian release 4.01.0-5

Conflicts:
	debian/changelog
---

6b95e8ea5efaf7473d3778318711dac4e56013ca
diff --cc debian/changelog
index 1239b6f7,7e9bae80..3acf97af
--- 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@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@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@debian.org>  Thu, 30 Oct 2014 09:28:06 +0100
+ 
  ocaml (4.01.0-4) unstable; urgency=medium
  
    * debian/patches: