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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 886997f4b81d8381abce940fe59023347e8e3a4c
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Oct 26 11:30:57 2009 +0100

    More concise code

diff --git a/debhelper/dh_ocaml b/debhelper/dh_ocaml
index 1d181c8..7bb48d6 100755
--- a/debhelper/dh_ocaml
+++ b/debhelper/dh_ocaml
@@ -273,14 +273,10 @@ foreach (@{$dh{DOPACKAGES}}) {
   { $dev_packages{$_} = $override_run_of_dev{$_} }
   elsif (exists $override_dev_of_run{$_})
   { $dev_packages{$override_dev_of_run{$_}} = $_ }
-  elsif (/^lib(.*)-ocaml-dev$/)
+  elsif (/^lib(.*)-(ocaml|camlp4)-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"} = $_ }
+  elsif (/^lib(.*-(ocaml|camlp4))$/)
+  { $dev_packages{"lib$1-dev"} = $_ }
   else
   { push(@binary_packages, $_) }
 }

-- 
dh-ocaml packaging