[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.2+debian-1-7-g9a2c9bd

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 9a2c9bd883b0a4d1f9631f0bbfc48f0feb611184
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 13 22:54:21 2009 +0200

    Use new features of dh-ocaml 0.9

diff --git a/debian/changelog b/debian/changelog
index 3838732..8e1be64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ocamlgraph (1.3+debian-1) UNRELEASED; urgency=low
   * New upstream release
   * Update README.source
   * Fix include order in debian/rules
+  * Use new features of dh-ocaml 0.9
+    - Generate documentation using dh_ocamldoc
 
  -- Mehdi Dogguy <mehdi at debian.org>  Tue, 13 Oct 2009 20:30:17 +0200
 
diff --git a/debian/control b/debian/control
index c9c37e1..f9c07f4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>, Stefano Zacchiroli <zack at debian.org>, Mehdi Dogguy <mehdi at debian.org>
 Build-Depends:
  cdbs,
- dh-ocaml (>= 0.4.1),
+ dh-ocaml (>= 0.9),
  debhelper (>= 7),
  dpatch,
  ocaml-nox (>= 3.11.1),
@@ -26,8 +26,11 @@ Package: libocamlgraph-ocaml-dev
 Architecture: any
 Section: ocaml
 Depends:
- ocaml-nox-${F:OCamlABI},
+ ${ocaml:Depends},
+ ${shlibs:Depends},
  ${misc:Depends}
+Provides:
+ ${ocaml:Provides}
 Suggests: graphviz | springgraph
 Description: graph library for OCaml
  Ocamlgraph is a graph library for OCaml. Its contribution is
@@ -60,9 +63,10 @@ Description: graph library for OCaml
 Package: ocamlgraph-editor
 Architecture: any
 Section: graphics
-Depends: ${shlibs:Depends},
+Depends:
+ ${shlibs:Depends},
  ${misc:Depends},
- ${F:OCamlInterp}
+ ${ocaml:Depends}
 Description: graphical graph editor based on hyperbolic geometry
  Ocamlgraph editor is an interactive graph editor for GNOME; it is based
  on hyperbolic geometry (it "zooms" more on graph nodes which are in the
diff --git a/debian/libocamlgraph-ocaml-dev.ocamldoc b/debian/libocamlgraph-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..e1026b8
--- /dev/null
+++ b/debian/libocamlgraph-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+-I src -I dgraph -I view_graph -I +lablgtk2
diff --git a/debian/rules b/debian/rules
index 70a241c..565b654 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,17 +26,9 @@ include $(CURDIR)/debian/mk/docbook-manpage.mk
 DEV_PKG = libocamlgraph-ocaml-dev
 DEB_MAKE_CLEAN_TARGET = distclean
 DEB_MAKE_BUILD_TARGET = all 
-# TODO: reactivate when it doc/intro.txt will be back
-#DEB_MAKE_BUILD_TARGET += doc
-DEB_MAKE_INSTALL_TARGET = install install-findlib \
-			  prefix="$(CURDIR)/debian/ocamlgraph-editor/usr" \
-			  DESTDIR="$(CURDIR)/debian/$(DEV_PKG)/" \
-			  OCAMLFIND_DESTDIR="$(CURDIR)/debian/$(DEV_PKG)/$(OCAML_STDLIB_DIR)"
-
-# TODO: reactive when doc/intro.txt will be back
-#OCAML_OCAMLDOC_PACKAGES_DOCBASE = $(DEV_PKG)
-OCAML_OCAMLDOC_PACKAGES = $(DEV_PKG)
-OCAML_OCAMLDOC_FLAGS += -I $(CURDIR)/src -I +lablgtk2
+DEB_MAKE_INSTALL_TARGET = install \
+			  BINDIR="$(CURDIR)/debian/ocamlgraph-editor/usr/bin" \
+			  INSTALL_LIBDIR="$(CURDIR)/debian/$(DEV_PKG)/$(OCAML_STDLIB_DIR)/ocamlgraph/"
 
 DEB_STRIP_EXCLUDE += usr/bin/ocamlgraph-editor.byte usr/bin/ocamlgraph-viewer.byte
 ifeq ($(OCAML_HAVE_OCAMLOPT),no)

-- 
ocamlgraph packaging