[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, 312/master, updated. debian/0.9.5-5-gf4866ee

[Stephane Glondu]

The following commit has been merged in the 312/master branch:
commit f4866eef79af7c9b3cf54c9d561c733062489d4c
Merge: a559272f6b6bf03af3645e6c4705f209db45e098 8c23773feae85f333133c45a809dfa094f8492df
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 10 16:12:10 2010 +0100

    Merge commit 'debian/0.9.5' into 312/master
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index b79f699,b0db8bd..53796ee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,20 @@@
 +dh-ocaml (1.0.0) UNRELEASED; urgency=low
 +
 +  * Adaptation to OCaml 3.12:
 +    - bump major version to 1.0, since this version won't work with
 +      previous versions of OCaml
 +    - there is a single ocamlobjinfo tool now; remove references to old
 +      ocaml{dumpapprox,plugininfo,byteinfo} tools from dh_ocaml and
 +      ocaml-md5sums
 +
 + -- Stéphane Glondu <glondu at debian.org>  Thu, 01 Jul 2010 18:33:22 +0200
 +
+ dh-ocaml (0.9.5) unstable; urgency=low
+ 
+   * Fix detection of Dynlink support.
+ 
+  -- Mehdi Dogguy <mehdi at debian.org>  Wed, 07 Jul 2010 19:03:26 +0200
+ 
  dh-ocaml (0.9.4) unstable; urgency=low
  
    [ Mehdi Dogguy ]

-- 
dh-ocaml packaging