[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.0-7-g78c5147

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 78c5147b16fe76a0b69b7a6e76d1184d27323e93
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Oct 9 21:46:11 2009 +0200

    Replace class/ocaml.mk with rules/ocaml.mk in policy/appendix-cdbs.xml

diff --git a/debian/changelog b/debian/changelog
index f20d445..2d8f101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,12 +9,13 @@ dh-ocaml (0.9.1) UNRELEASED; urgency=low
     package when needed. The variable WITH_DH_OCAML has to be set
     to 0 to desactivate dh_ocaml.
   * ocaml-md5sums: Print object file's name when failing
+  * Replace class/ocaml.mk with rules/ocaml.mk in policy/appendix-cdbs.xml
 
   [ Stefano Zacchiroli ]
   * dh_ocamldoc manpage improvements: mention how ocamlfind is detected
     and that order is relevant when shipping doc elsewhere
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 17:17:24 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 09 Oct 2009 21:45:20 +0200
 
 dh-ocaml (0.9.0) unstable; urgency=low
 
diff --git a/policy/appendix-cdbs.xml b/policy/appendix-cdbs.xml
index 7d2ebd2..7c95357 100644
--- a/policy/appendix-cdbs.xml
+++ b/policy/appendix-cdbs.xml
@@ -18,17 +18,17 @@
 
   <para>
     To use the class in your package it is enough to include the file
-    <filename>/usr/share/cdbs/1/class/ocaml.mk</filename> from your
+    <filename>/usr/share/cdbs/1/rules/ocaml.mk</filename> from your
     <filename>debian/rules</filename>. If you use debhelper (please do) you
     should include the OCaml class after the debhelper on. A typical
     <filename>debian/rules</filename> heading for a package using plain Makefile
     (i.e. no autotools) and dpatch is as follows:
     <programlisting>
   #!/usr/bin/make -f
+  include /usr/share/cdbs/1/rules/dpatch.mk
   include /usr/share/cdbs/1/rules/debhelper.mk
   include /usr/share/cdbs/1/class/makefile.mk
-  include /usr/share/cdbs/1/class/ocaml.mk
-  include /usr/share/cdbs/1/rules/dpatch.mk
+  include /usr/share/cdbs/1/rules/ocaml.mk
     </programlisting>
     For an example of such a package see the <filename>pcre-ocaml</filename>
     Debian source package.

-- 
dh-ocaml packaging