[Pkg-ocaml-maint-commits] [SCM] headache packaging branch, master, updated. debian/1.03-17-1-ge544570

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit e544570db38001d4689c71e1d9c063e104f46ef5
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sun Jul 26 12:07:17 2009 +0000

    Upgrade to dh-ocaml 0.9
    
    * Invert CDBS debhelper.mk and ocaml.mk to avoid leaving
      *.debhelper.log
    * Upgrade to dh-ocaml 0.9

diff --git a/debian/changelog b/debian/changelog
index 6670b7a..1884e64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+headache (1.03-18) UNRELEASED; urgency=low
+
+  * Invert CDBS debhelper.mk and ocaml.mk to avoid leaving
+    *.debhelper.log
+  * Upgrade to dh-ocaml 0.9
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun, 26 Jul 2009 12:04:08 +0000
+
 headache (1.03-17) unstable; urgency=low
 
   * Switch packaging to git
diff --git a/debian/control b/debian/control
index cd1f1e3..f164d91 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Stefano Zacchiroli <zack at debian.org>,
  Ralf Treinen <treinen at debian.org>,
  Sylvain Le Gall <gildor at debian.org>
 Build-Depends-Indep: po-debconf, xsltproc, libxml2-utils, docbook-xsl, docbook-xml
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), dh-ocaml (>= 0.9)
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/headache.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/headache.git
@@ -15,7 +15,7 @@ Homepage: http://cristal.inria.fr/~simonet/soft/
 Package: headache
 Architecture: all
 Section: devel
-Depends: ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}
 Description: Tool to manage license notes of source files
  This tool help you add/remove the license note you can 
  find at the beginning of most source files. 
diff --git a/debian/rules b/debian/rules
index d56775e..4e676d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
+include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 DEB_MAKE_CLEAN_TARGET    := clean
 DEB_MAKE_BUILD_TARGET    := 

-- 
headache packaging