[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.1-5-ge2d7d7f

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit e2d7d7f62b1c94214b2ec80c04b381953c744dd3
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Oct 26 10:59:19 2009 +0100

    Handle relations between libXXXX-camlp4-dev and libXXXX-camlp4 packages.

diff --git a/debhelper/dh_ocaml b/debhelper/dh_ocaml
index 0347774..1d181c8 100755
--- a/debhelper/dh_ocaml
+++ b/debhelper/dh_ocaml
@@ -54,10 +54,10 @@ ${ocaml:Provides} and ${ocaml:Depends} substitutions and adding them to
 substvars files.
 
 dh_ocaml acts on three kinds of binary packages: those shipping development
-part of OCaml libraries (usually named libXXX-ocaml-dev), those shipping
-runtime for OCaml libraires (e.g. plugin and shared library, usually named
-libXXX-ocaml) and those shipping OCaml bytecode non-custom executables (i.e.
-executables interpreted by /usr/bin/ocamlrun).
+part of OCaml libraries (usually named libXXX-ocaml-dev or libXXXX-camlp4-dev),
+those shipping runtime for OCaml libraires (e.g. plugin and shared library,
+usually named libXXX-ocaml or libXXXX-camlp4) and those shipping OCaml bytecode
+non-custom executables (i.e.  executables interpreted by /usr/bin/ocamlrun).
 
 On specific package the convention is XXX for development and XXX-base for
 runtime (e.g. ocaml-nox and ocaml-base-nox).
@@ -115,6 +115,9 @@ dependency from XXXX to the appropriate libYYYY-ocaml-NNNN packages.
 For runtime package ${ocaml:Provides} will be set libXXXX-ocaml-NNNN and
 for development package to libXXX-ocaml-dev-NNNN.
 
+The same kind of relations are established between libXXXX-camlp4 and
+libXXXX-camlp4-dev packages.
+
 =head1 OPTIONS
 
 =over 4
@@ -145,7 +148,8 @@ The association between development part of libraries and their runtimes is
 guessed by dh_ocaml according to the OCaml packaging policy. Thus,
 libXXX-ocaml-dev is the name of the package shipping the development part of XXX
 library while libXXX-ocaml, if any, is the name of the package shipping the
-corresponding runtime.
+corresponding runtime. libXXXX-camlp4-dev and libXXXX-camlp4 packages are
+handled the same way.
 
 Using --runtime-map you could override the pairs development package name,
 runtime package name. The value passed to --runtime-map admits no spaces and
@@ -155,9 +159,9 @@ two package names separated by a colon (stating that the first corresponds to
 the development part of a library, while the second to its accompanying runtime
 part).
 
-Every package that doesn't follow libXXX-ocaml-dev/libXXX-ocaml or which is not
-defined in the runtime map are considered to be binary package and will be searched
-only for bytecode.
+Every package that doesn't follow libXXX-ocaml-dev/libXXX-ocaml,
+libXXXX-camlp4-dev/libXXXX-camlp4 or which is not defined in the runtime map
+are considered to be binary package and will be searched only for bytecode.
 
 =back
 
@@ -165,7 +169,7 @@ only for bytecode.
 
 =over 4
 
-=item I<debian/libXXX-ocaml-dev.olist>
+=item I<debian/libXXX-ocaml-dev.olist> I<debian/libXXX-camlp4-dev.olist>
 
 By default, the list of OCaml objects or bytecode binaries shipped by your
 package which should be analyzed for retrieving dependency information is
@@ -271,8 +275,12 @@ foreach (@{$dh{DOPACKAGES}}) {
   { $dev_packages{$override_dev_of_run{$_}} = $_ }
   elsif (/^lib(.*)-ocaml-dev$/)
   { $dev_packages{$_} = "-" if not defined($dev_packages{$_}) }
+  elsif (/^lib(.*)-camlp4-dev$/)
+  { $dev_packages{$_} = "-" if not defined($dev_packages{$_}) }
   elsif (/^lib(.*)-ocaml$/)
   { $dev_packages{"lib$1-ocaml-dev"} = $_ }
+  elsif (/^lib(.*)-camlp4$/)
+  { $dev_packages{"lib$1-camlp4-dev"} = $_ }
   else
   { push(@binary_packages, $_) }
 }
diff --git a/debian/changelog b/debian/changelog
index 850423c..c244ade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ dh-ocaml (0.9.2) UNRELEASED; urgency=low
 
   [ Mehdi Dogguy ]
   * Use my debian address instead of the old ones, everywhere.
+  * Handle relations between libXXXX-camlp4-dev and libXXXX-camlp4
+    packages (Closes: #552392).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Mon, 26 Oct 2009 10:45:12 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 26 Oct 2009 10:58:49 +0100
 
 dh-ocaml (0.9.1) unstable; urgency=low
 

-- 
dh-ocaml packaging