The following commit has been merged in the master branch:
commit eea947900ab4ea2f6cde4b6fd1f6b812d8eb8971
Merge: f3bb6e3fded23040d87c904c1bd837158f40e524 
2910cc2dbf344f3e67837b033e72c28c93997f91
Author: Stephane Glondu <st...@glondu.net>
Date:   Sat Apr 16 10:58:11 2011 +0200

    Merge branch '312/master'

diff --combined debian/changelog
index b6edba0,610723f..607848f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,20 @@@
- dh-ocaml (0.9.7) UNRELEASED; urgency=low
+ dh-ocaml (1.0.0) UNRELEASED; urgency=low
+ 
++  [ Stéphane Glondu ]
+   * 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
  
 +  [ Ralf Treinen ]
 +  * Changed suggestion of git-core to git.
 +
 +  [ Sylvain Le Gall ]
 +  * Fix --notifications option for dom-new-git-repo
 +
-  -- Ralf Treinen <trei...@debian.org>  Tue, 07 Sep 2010 10:07:54 +0200
+  -- Stéphane Glondu <glo...@debian.org>  Thu, 01 Jul 2010 18:33:22 +0200
  
  dh-ocaml (0.9.6) unstable; urgency=low
  
@@@ -21,7 -22,7 +29,7 @@@
        remote branches before creating local ones (Closes: #591555)
  
    [ Ralf Treinen ]
-   * policy/: continue work started by Sylvain Le Gall on splitting the 
+   * policy/: continue work started by Sylvain Le Gall on splitting the
      document into policy and reference (thanks, Sylvain!):
      - current value of ocaml version no longer mentionend in policy
      - fix location of library directory (closes: #591556)
diff --combined debian/control
index 182475d,d47475d..3cfae49
--- a/debian/control
+++ b/debian/control
@@@ -25,7 -25,7 +25,7 @@@ Architecture: al
  Depends: ${misc:Depends}
  Recommends:
   debhelper,
-  ocaml-nox
+  ocaml-nox (>> 3.12)
  Replaces:
   ocaml-base-nox (<< 3.11.0~beta1-1),
   ocaml (<< 3.11.0~beta1-1),
@@@ -37,7 -37,7 +37,7 @@@ Breaks
   ocaml-nox (<< 3.11.0~beta1-1),
   ocaml-base (<< 3.11.0~beta1-1)
  Suggests:
 - git-core
 + git
  Description: helper tools for maintaining OCaml-related Debian packages
   dh-ocaml is a set of tools and documents to help maintaining Debian
   packages related to the Objective Caml (OCaml) programming language.

-- 
dh-ocaml packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to