[Pkg-ocaml-maint-commits] [SCM] ocaml-tools packaging branch, master, updated. debian/20090719-1-31-g8df3dd9

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 04216a086297ffb4d0b5fd078e834016e24c014c
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jan 4 21:33:52 2012 +0100

    Compile and install ocamldot

diff --git a/debian/control b/debian/control
index d740e9a..538bc53 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,14 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Ralf Treinen <treinen at debian.org>,
  Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 6.0.7~)
+Build-Depends: debhelper (>= 6.0.7~), ocaml-nox, dh-ocaml (>= 0.9)
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-tools.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-tools.git
 
 Package: ocaml-tools
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ocaml-base-nox-${F:OCamlABI}
 Recommends: vim, vim-addon-manager
 Enhances: ocaml
 Suggests: autoconf, otags
@@ -23,3 +23,4 @@ Description: tools for OCaml developers
   * ocaml-autoconf: autoconf macros for OCaml
   * omlet: a better OCaml indentation mode for vim
   * a configure.in and Makefile.in template
+  * ocamldot: generate program dependency graphs for OCaml programs
diff --git a/debian/copyright b/debian/copyright
index 20e3ab9..701b6e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,3 +51,13 @@ Copyright (C) 2005 David Baelde
 On Debian systems you can find a copy of this license in
 /usr/share/common-licenses/GPL-2
 
+ocamldot
+--------
+Dowloaded from http://www.research.att.com/~trevor/ocamldot/index.html
+
+Upstream Author: Trevor Jim <trevor at research.att.com>
+
+Copyright:
+
+Ocamldot was written by Trevor Jim.  It is in the public domain; use
+it however you like, at your own risk.
diff --git a/debian/docs b/debian/docs
index 7ba1d32..88b6285 100644
--- a/debian/docs
+++ b/debian/docs
@@ -2,3 +2,4 @@ ocaml-autoconf/README.ocaml-autoconf
 ocaml-autoconf/ocaml.m4.txt
 omlet-*/README.omlet
 omlet-*/changelog.omlet
+README.ocamldot
diff --git a/debian/install b/debian/install
index d9b7c0d..6766355 100644
--- a/debian/install
+++ b/debian/install
@@ -8,3 +8,6 @@ debian/vim-omlet.yaml		/usr/share/vim/registry
 # autoconf samples
 autoconf/configure.in		/usr/share/ocaml-tools
 autoconf/Makefile.in		/usr/share/ocaml-tools
+
+# ocamldot
+ocamldot/ocamldot		/usr/bin
diff --git a/debian/manpages b/debian/manpages
index c5289c6..6c1497b 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1,2 @@
 ocaml-autoconf/ocaml.m4.1
+ocamldot/ocamldot.1
diff --git a/debian/rules b/debian/rules
index 270c5af..5c651dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # debian/rules for ocaml-tools
 
+include /usr/share/ocaml/ocamlvars.mk
+
 DESTDIR := $(CURDIR)/debian/ocaml-tools
 
 # top level dir for documentation
@@ -16,15 +18,20 @@ OMLETSRC = $(shell echo omlet-*)
 
 build:
 	$(MAKE) -C ocaml-autoconf/
+	$(MAKE) -C ocamldot/ ocamldot
 	cp ocaml-autoconf/README ocaml-autoconf/README.ocaml-autoconf
 	cd omlet-* && (cp README README.omlet ; cp ChangeLog changelog.omlet)
+	cp ocamldot/README README.ocamldot
+	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/ocaml-tools.substvars
 
 clean: 
 	dh_testdir
 	dh_testroot
 	$(MAKE) -C ocaml-autoconf/ clean
+	$(MAKE) -C ocamldot/ clean
 	rm -f ocaml-autoconf/README.ocaml-autoconf
 	rm -f omlet-*/README.omlet omlet-*/changelog.omlet
+	rm -f README.ocamldot
 	dh_clean
 
 install:

-- 
ocaml-tools packaging