[Pkg-ocaml-maint-commits] [SCM] headache packaging branch, master, updated. debian/1.03-21-5-gfda0924

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit fda092418aac07f763c5aa40e92c45ccdb060fd6
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Jan 5 21:45:17 2012 +0100

    Fix headache's dependencies

diff --git a/debian/changelog b/debian/changelog
index 299cd7d..44dc408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,15 @@ headache (1.03-22) unstable; urgency=low
   [ Mehdi Dogguy ]
   * Added patch utf8_length: fix length of lines containing UTF8 characters
     (Closes: #620379)
+  * Since headache is an arch:all package, we cannot use dh_ocaml inferred
+    dependencies. We replace the substitution variable ${ocaml:Depends} with
+    "ocaml-base-nox-${F:OCamlABI}, libextlib-ocaml" for now.
 
   [ Ralf Treinen ]
   * Added build-dependency on libextlib-ocaml-dev, needed for the utf8_length
     patch
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 05 Jan 2012 21:22:00 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 05 Jan 2012 21:43:07 +0100
 
 headache (1.03-21) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4c37dde..6d499f0 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://cristal.inria.fr/~simonet/soft/
 
 Package: headache
 Architecture: all
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, libextlib-ocaml, ${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 9ebeb7c..84f2957 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,3 +30,4 @@ clean::
 
 build/headache::
 	$(DEB_MAKE_ENVVARS) $(MAKE) -C $(CURDIR)/debian/xml-man all
+	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/headache.substvars

-- 
headache packaging