[Pkg-ocaml-maint-commits] [SCM] lablgtk2-doc packaging branch, master, updated. debian/2.4.0v0.2tv-8-6-g71714f5

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 71714f56a8cd27a5eb0ebec2aca42a5fc534243d
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Sun Mar 1 21:27:14 2009 +0100

    Use dh-ocaml.

diff --git a/debian/changelog b/debian/changelog
index f0f0e4c..ab3b6b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,19 @@
-lablgtk2-doc (2.4.0v0.2tv-9) UNRELEASED; urgency=low
-
-  [ Stefano Zacchiroli ]
-  * fix vcs-svn field to point just above the debian/ dir
+lablgtk2-doc (2.4.0v0.2tv-9) unstable; urgency=low
 
   [ Ralf Treinen ]
-  * Changed doc-base section to Programming/OCaml
+  * Changed doc-base section to Programming/OCaml.
 
   [ Stephane Glondu ]
-  * Fix sereval spelling errors reported by Lintian
+  * Fix sereval spelling errors reported by Lintian.
 
   [ Samuel Mimram ]
-  * Switch packaging to git
+  * Rebuild with latest version of lablgtk2.
+  * Use dh-ocaml.
+  * Switch packaging to git.
+  * Update compat to 7.
+  * Update standards version to 3.8.0.
 
- -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 19:36:35 +0100
+ -- Samuel Mimram <smimram at debian.org>  Sun, 01 Mar 2009 21:23:37 +0100
 
 lablgtk2-doc (2.4.0v0.2tv-8) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index c633bbe..7d5c6ce 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: doc
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0)
-Build-Depends-Indep: docbook-utils, ocaml-nox, liblablgl-ocaml-dev, liblablgtk2-ocaml-dev (>= 2.4.0+2004.11.19-3), liblablgtk2-gnome-ocaml-dev, docbook-xml
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: docbook-utils, dh-ocaml, ocaml-nox (>= 3.11), liblablgl-ocaml-dev (>= 1.04), liblablgtk2-ocaml-dev (>= 2.12.0), liblablgtk2-gnome-ocaml-dev (>= 2.12.0), docbook-xml
 Build-Conflicts-Indep: sgmltexi
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2-doc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lablgtk2-doc.git
 
diff --git a/debian/liblablgtk2-ocaml-doc.doc-base.tutorial b/debian/liblablgtk2-ocaml-doc.doc-base.tutorial
index b5db607..c1d0653 100644
--- a/debian/liblablgtk2-ocaml-doc.doc-base.tutorial
+++ b/debian/liblablgtk2-ocaml-doc.doc-base.tutorial
@@ -1,5 +1,5 @@
 Document: lablgtk2-tutorial
-Title: GTK+ 2.0 Tutorial using Ocaml
+Title: GTK+ 2.0 Tutorial using OCaml
 Author: Tony Gale, Ian Main, the GTK+ team, SooHyoung Oh
 Abstract: Learn how to develop applications using the GTK+ API in OCaml with the lablgtk2 library.
 Section: Programming/OCaml
diff --git a/debian/rules b/debian/rules
index 144b6dc..0a04dbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-OCAMLABI := $(shell ocamlc -version)
+include /usr/share/ocaml/ocamlvars.mk
 
 PREFIX = debian/liblablgtk2-ocaml-doc
 TMPDIR = debian/tmp
@@ -20,13 +20,13 @@ build-stamp:
 	$(MAKE) -C treeview-tutorial
 
 	mkdir -p $(TMPDIR)/html
-	ocamldoc -html -m A -d $(TMPDIR)/html \
-	-I /usr/lib/ocaml/$(OCAMLABI)/lablgtk2 -I /usr/lib/ocaml/$(OCAMLABI)/lablgl \
-	-I /usr/lib/ocaml/$(OCAMLABI)/threads $(wildcard /usr/lib/ocaml/$(OCAMLABI)/lablgtk2/*.mli)
+	$(OCAML_OCAMLDOC) -html -m A -d $(TMPDIR)/html \
+	-I $(OCAML_STDLIB_DIR)/lablgtk2 -I $(OCAML_STDLIB_DIR)/lablgl \
+	-I $(OCAML_STDLIB_DIR)/threads $(wildcard $(OCAML_STDLIB_DIR)/lablgtk2/*.mli)
 	mkdir -p $(TMPDIR)/man
-	ocamldoc -man -man-mini -m A -d $(TMPDIR)/man -man-section 3o -man-suffix 3o \
-	-I /usr/lib/ocaml/$(OCAMLABI)/lablgtk2 -I /usr/lib/ocaml/$(OCAMLABI)/lablgl \
-	-I /usr/lib/ocaml/$(OCAMLABI)/threads $(wildcard /usr/lib/ocaml/$(OCAMLABI)/lablgtk2/*.mli)
+	$(OCAML_OCAMLDOC) -man -man-mini -m A -d $(TMPDIR)/man -man-section 3o -man-suffix 3o \
+	-I $(OCAML_STDLIB_DIR)/lablgtk2 -I $(OCAML_STDLIB_DIR)/lablgl \
+	-I $(OCAML_STDLIB_DIR)/threads $(wildcard $(OCAML_STDLIB_DIR)/lablgtk2/*.mli)
 
 	touch build-stamp
 
@@ -49,7 +49,6 @@ install: build
 	cp $(TMPDIR)/man/* $(PREFIX)/usr/share/man/man3
 	cd $(PREFIX)/usr/share/doc/liblablgtk2-ocaml-dev; ln -s ../liblablgtk2-ocaml-doc docs
 
-# Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
@@ -67,7 +66,6 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-# Build architecture-dependent files here.
 binary-arch: build install
 
 binary: binary-indep binary-arch

-- 
lablgtk2-doc packaging