[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, 312/master, updated. debian/0.9.6-6-gf9e276f

[Stephane Glondu]

The following commit has been merged in the 312/master branch:
commit f9e276fde1057b9f069348116d01c0f49b23bd3a
Merge: f4866eef79af7c9b3cf54c9d561c733062489d4c 8e1181372c24694924a0a1f578dc7eea49b1aa78
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 7 09:24:06 2010 +0200

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

diff --combined debian/changelog
index 53796ee,3fcc24e..610723f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,33 +1,44 @@@
 +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.6) unstable; urgency=low
+ 
+   [ Stéphane Glondu ]
+   * debian/control:
+     - add git-core to Suggests
+     - bump Standards-Version to 3.9.1 (no changes)
+   * tools/:
+     - dom-new-git-repo: explicitly use sh when executing remote commands
+       via ssh (Closes: #588371)
+     - dom-git-checkout: check for existence of upstream/pristine-tar
+       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)
+     - refactor sections, many small changes all over the document
+     - streamline discussion on bytecode vs native code
+     - compiling with -custom is deprecated (closes: #500286)
+     - reference: add section on dh
+     - findlib integration: META files always go in the directory of the
+       library, debian-specific ones should have a comment.
+   * Makefile: generate the reference document
+   * update authors in doc-base registration for the policy
+   * add doc-base registration for the reference.
+   * Added myself to uploaders.
+ 
+  -- Ralf Treinen <treinen at debian.org>  Mon, 06 Sep 2010 20:30:15 +0200
+ 
  dh-ocaml (0.9.5) unstable; urgency=low
  
    * Fix detection of Dynlink support.
diff --combined debian/control
index a11499f,4698a26..d47475d
--- a/debian/control
+++ b/debian/control
@@@ -6,16 -6,17 +6,17 @@@ Uploaders
   Mehdi Dogguy <mehdi at debian.org>,
   Samuel Mimram <smimram at debian.org>,
   Stéphane Glondu <glondu at debian.org>,
-  Sylvain Le Gall <gildor at debian.org>
+  Sylvain Le Gall <gildor at debian.org>,
+  Ralf Treinen <treinen at debian.org>
  Build-Depends:
   debhelper (>= 7)
  Build-Depends-Indep:
-  docbook-xml,
+  docbook-xml (>= 4.4),
   docbook-xsl,
   xsltproc,
   libxml2-utils,
   lynx
- Standards-Version: 3.9.0
+ Standards-Version: 3.9.1
  Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/dh-ocaml.git
  Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/dh-ocaml.git
  
@@@ -24,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),
@@@ -35,6 -36,8 +36,8 @@@ Breaks
   ocaml (<< 3.11.0~beta1-1),
   ocaml-nox (<< 3.11.0~beta1-1),
   ocaml-base (<< 3.11.0~beta1-1)
+ Suggests:
+  git-core
  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