[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/1.0.3-1-gb472e93

[Mehdi Dogguy]

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

    Do not pass DH_ALWAYS_EXCLUDE to ocamldoc in dh_ocamldoc (Closes: #627427)

diff --git a/debhelper/dh_ocamldoc b/debhelper/dh_ocamldoc
index 92ea5f3..b346d07 100755
--- a/debhelper/dh_ocamldoc
+++ b/debhelper/dh_ocamldoc
@@ -188,6 +188,7 @@ sub do_doc_package($@) {
     my ($package, @ocamldoc_files) = @_;
     foreach my $fdoc (@ocamldoc_files) {
         my $ocamldoc = $odoc;
+        my $find_floags = "";
         # Set doc-base document id
         my $document_name = $fdoc;
         $document_name =~ s/debian\/.*(\.)?ocamldoc//g;
@@ -197,13 +198,13 @@ sub do_doc_package($@) {
             next;
         }
         if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
-            $ocamldoc_flags .= ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
+            $find_flags .= ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
         }
         my $dest_dir = ocamldoc_destdir_html($package, $html_dir);
         my $tmpdir = tmpdir($package);
         my $search_dir = "$tmpdir$ocaml_lib_dir";
         my $include_extra_dirs = "";
-        $include_extra_dirs = `find ${search_dir} -type d -printf ' -I %p'` if -d $search_dir;
+        $include_extra_dirs = `find ${search_dir} -type d $find_flags -printf ' -I %p'` if -d $search_dir;
         $ocamldoc = "ocamlfind ocamldoc" if $use_ocamlfind;
         my $doc_files = "";
         if (-d $search_dir) {
diff --git a/debian/changelog b/debian/changelog
index 8f17626..cb9124a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-ocaml (1.0.4) UNRELEASED; urgency=low
+
+  * Do not pass DH_ALWAYS_EXCLUDE to ocamldoc in dh_ocamldoc (Closes: #627427)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 05 Jan 2012 14:00:48 +0100
+
 dh-ocaml (1.0.3) unstable; urgency=low
 
   [ Євгеній Мещеряков ]

-- 
dh-ocaml packaging