[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. upstream/3.11.0-12-g05161f1

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 5aa937d1218d701c669edf650ea4279c5beae895
Author: Samuel Mimram <smimram at debian.org>
Date:   Wed Feb 11 17:26:25 2009 +0100

    Correct installation of files.

diff --git a/debian/jocaml.install.in b/debian/jocaml.install.in
new file mode 100644
index 0000000..2e50034
--- /dev/null
+++ b/debian/jocaml.install.in
@@ -0,0 +1,3 @@
+/usr/bin/jocaml*
+/usr/lib/jocaml/@JOCamlABI@/threads/jocaml*
+/usr/lib/jocaml/@JOCamlABI@/vmthreads/jocaml*
diff --git a/debian/jocaml.links.opt b/debian/jocaml.links.opt
index 5eb4cdf..677fd14 100644
--- a/debian/jocaml.links.opt
+++ b/debian/jocaml.links.opt
@@ -2,4 +2,3 @@ usr/share/man/man1/jocamlc.1.gz     usr/share/man/man1/jocamlc.opt.1.gz
 usr/share/man/man1/jocamlopt.1.gz   usr/share/man/man1/jocamlopt.opt.1.gz
 usr/share/man/man1/jocamllex.1.gz   usr/share/man/man1/jocamllex.opt.1.gz
 usr/share/man/man1/jocamldep.1.gz   usr/share/man/man1/jocamldep.opt.1.gz
-
diff --git a/debian/rules b/debian/rules
index e86aec5..d895beb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ config-stamp: pre-config
 	--host $(DEB_HOST_GNU_TYPE)
 	touch $@
 
-build-arch: config-stamp build-arch-stamp 
+build-arch: config-stamp build-arch-stamp
 build-arch-stamp:
 	if test ! -d boot.debian; then   \
                 cp -xa boot boot.debian; \
@@ -50,11 +50,11 @@ build-indep-stamp:
 	# create ocaml source tarball
 	touch $@
 
-clean: 
+clean:
 	dh_testdir
 	dh_testroot
-	$(RM) -rf build-indep-stamp build-arch-stamp config-stamp myocamlbuild_config.ml
-	$(RM) -f debian/jocaml.install debian/jocaml.dirs
+	$(RM) -rf build-indep-stamp build-arch-stamp config-stamp myocamlbuild_config.ml _tags
+	$(RM) -f $(OFILES) debian/jocaml.links
 	if [ -f Makefile -a -f config/Makefile ]; then \
 		$(MAKE) clean;   \
 	fi
@@ -72,10 +72,12 @@ install: build-arch build-indep
 	$(MAKE) PREFIX=$(CURDIR)/debian/jocaml/usr LIBDIR=$(CURDIR)/debian/jocaml/usr/lib/jocaml/$(JOCAMLABI) install
 	chmod +x $(CURDIR)/debian/jocaml/usr/lib/jocaml/$(JOCAMLABI)/camlheader
 	find $(CURDIR)/debian/jocaml/ -type f -iname "*.ml" -exec rm -f {} \;
+	$(RM) -f $(CURDIR)/debian/jocaml/usr/bin/ocaml*
 
 binary-common:
 	dh_testdir
 	dh_testroot
+	dh_install --list-missing
 	dh_installchangelogs Changes
 	dh_installdocs
 	dh_installman

-- 
jocaml packaging