[Pkg-ocaml-maint-commits] [SCM] lablgtk2 packaging branch, master, updated. debian/2.12.0-1-7-g35e8983

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 35e8983039d352f267654a8c461d27ff4480d782
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Fri Feb 20 10:38:09 2009 +0100

    Use the OCAML_OCAMLDOC variable to get the best ocamldoc.

diff --git a/debian/changelog b/debian/changelog
index ca243a8..6299649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ lablgtk2 (2.12.0-2) UNRELEASED; urgency=low
   * Use dh-ocaml predefined variables in rules.
   * Use native version of ocamldoc if available.
 
- -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 09:53:01 +0100
+ -- Samuel Mimram <smimram at debian.org>  Fri, 20 Feb 2009 10:37:41 +0100
 
 lablgtk2 (2.12.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index ba1d794..bcc4ee6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Uploaders:
  Stephane Glondu <steph at glondu.net>
 Build-Depends:
  debhelper (>> 7.0.0),
- dh-ocaml (>= 0.2),
+ dh-ocaml (>= 0.3),
  ocaml,
  camlp4,
  libncurses5-dev,
diff --git a/debian/rules b/debian/rules
index 5dd4787..202e8fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR = $(CURDIR)/debian/tmp
-OCAMLDOC = $(if $(OCAML_OPT_ARCH),ocamldoc.opt,ocamldoc)
 
 # We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
@@ -107,7 +106,7 @@ binary-arch: build install
 	  mkdir -p debian/$$i/usr/share/doc/$$i/html/api; \
 	  find debian/$$i/$(OCAML_STDLIB_DIR)/ \
   	    -type f -name '*.mli' \
-	    | xargs $(OCAMLDOC) -I $(OCAML_STDLIB_DIR)/lablgl -I $(OCAML_STDLIB_DIR)/threads \
+	    | xargs $(OCAML_OCAMLDOC) -I $(OCAML_STDLIB_DIR)/lablgl -I $(OCAML_STDLIB_DIR)/threads \
 	     -pp "sed 's/@gtkdoc *\([A-Za-z-]* *[A-Za-z-]*\)/\(gtkdoc: \1\)/g'" \
 	     -stars -m A -no-custom-tags $$OCAMLDOC_INCLUDE -html \
 	     -d debian/$$i/usr/share/doc/$$i/html/api \

-- 
lablgtk2 packaging