[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. upstream/3.11.0-15-gdf90773
Samuel Mimram
smimram at debian.org
Fri Feb 27 17:58:50 UTC 2009
The following commit has been merged in the master branch:
commit df90773e90ffda3a3232e6a036e4c082fe5276c3
Author: Samuel Mimram <smimram at debian.org>
Date: Fri Feb 27 15:38:27 2009 +0100
Better installation.
diff --git a/debian/control b/debian/control
index 44b9edc..548ab3d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Mehdi Dogguy <dogguy at pps.jussieu.fr>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, libx11-dev, dh-ocaml, ocaml-nox (>= 3.11)
+Build-Depends: debhelper (>= 7), autotools-dev, libx11-dev, libncurses5-dev, libgdbm-dev, dh-ocaml, ocaml-nox (>= 3.11)
Homepage: http://jocaml.inria.fr/
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/jocaml.git
@@ -11,10 +11,24 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/jocaml.git
Package: jocaml
Architecture: any
-Depends: ${shlibs:Depends}, ocaml-nox-${F:JOCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, jocaml-base (=${binary:Version}), ocaml-nox-${F:JOCamlABI}
Provides: jocaml-${F:JOCamlABI}
Description: OCaml extended for concurrent and distributed programming
- The JoCaml programming language is an extension of the OCaml language with
+ The JOCaml programming language is an extension of the OCaml language with
high-level prmitives for communication and synchronization between processes.
This enables programmers to rapidly develop distributed large-scale
applications using the expressivity of OCaml.
+
+Package: jocaml-base
+Architecture: any
+Provides: jocaml-base-${F:JOCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml extended for concurrent and distributed programming
+ The JOCaml programming language is an extension of the OCaml language with
+ high-level prmitives for communication and synchronization between processes.
+ This enables programmers to rapidly develop distributed large-scale
+ applications using the expressivity of OCaml.
+ .
+ This package contains only the runtime system needed to run bytecode
+ executables. The 'jocaml' package contains the full development suite of
+ JOCaml.
diff --git a/debian/jocaml-base.install.in b/debian/jocaml-base.install.in
new file mode 100644
index 0000000..2c5832b
--- /dev/null
+++ b/debian/jocaml-base.install.in
@@ -0,0 +1,5 @@
+usr/bin/jocamlrun
+ at JOCamlStdlibDir@/ld.conf
+ at JOCamlStdlibDir@/stublibs/*thread*
+ at JOCamlStdlibDir@/threads/*.cma
+ at JOCamlStdlibDir@/vmthreads/*.cma
diff --git a/debian/jocaml-base.manpages b/debian/jocaml-base.manpages
new file mode 100644
index 0000000..08ff103
--- /dev/null
+++ b/debian/jocaml-base.manpages
@@ -0,0 +1 @@
+debian/man/jocamlrun.1
diff --git a/debian/jocaml.install.in b/debian/jocaml.install.in
index 02dbd18..50cef81 100644
--- a/debian/jocaml.install.in
+++ b/debian/jocaml.install.in
@@ -1,3 +1,27 @@
-usr/bin/jocaml*
- at JOCamlStdlibDir@/threads/join*
- at JOCamlStdlibDir@/vmthreads/join*
+usr/bin/jocaml
+usr/bin/jocamlc*
+usr/bin/jocamlcp
+usr/bin/jocamldep*
+usr/bin/jocamllex*
+usr/bin/jocamlmklib
+usr/bin/jocamlmktop
+usr/bin/jocamlopt*
+usr/bin/jocamlprof
+usr/bin/jocamlyacc
+ at JOCamlStdlibDir@/addlabels
+ at JOCamlStdlibDir@/scrapelabels
+ at JOCamlStdlibDir@/camlheader*
+ at JOCamlStdlibDir@/expunge
+ at JOCamlStdlibDir@/extract_crc
+ at JOCamlStdlibDir@/Makefile.config
+ at JOCamlStdlibDir@/libcamlrun*
+ at JOCamlStdlibDir@/libasmrun*
+ at JOCamlStdlibDir@/*thread*.a
+ at JOCamlStdlibDir@/threads/*.mli
+ at JOCamlStdlibDir@/threads/*.a
+ at JOCamlStdlibDir@/threads/*.cmxa
+ at JOCamlStdlibDir@/threads/*.cmx
+ at JOCamlStdlibDir@/threads/*.cmi
+ at JOCamlStdlibDir@/vmthreads/*.mli
+ at JOCamlStdlibDir@/vmthreads/*.a
+ at JOCamlStdlibDir@/vmthreads/*.cmi
diff --git a/debian/jocaml.lintian-overrides.in b/debian/jocaml.lintian-overrides.in
new file mode 100644
index 0000000..cfa1636
--- /dev/null
+++ b/debian/jocaml.lintian-overrides.in
@@ -0,0 +1,14 @@
+ocaml-nox: script-not-executable . at JOCamlStdlibDir@/camlheader
+W: jocaml: unusual-interpreter ./usr/bin/jocaml #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter ./usr/bin/jocamlc #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter ./usr/bin/jocamlcp #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter ./usr/bin/jocamldep #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter ./usr/bin/jocamllex #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter ./usr/bin/jocamlmklib #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter ./usr/bin/jocamlopt #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter ./usr/bin/jocamlprof #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/addlabels #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/camlheader #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/expunge #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/extract_crc #!/usr/bin/jocamlrun
+W: jocaml: unusual-interpreter . at JOCamlStdlibDir@/scrapelabels #!/usr/bin/jocamlrun
diff --git a/debian/jocaml.manpages b/debian/jocaml.manpages
index 73b2ab5..3383eff 100644
--- a/debian/jocaml.manpages
+++ b/debian/jocaml.manpages
@@ -4,6 +4,5 @@ debian/man/jocamldep.1
debian/man/jocamllex.1
debian/man/jocamlmktop.1
debian/man/jocamlopt.1
-debian/man/jocamlrun.1
debian/man/jocamlyacc.1
debian/man/jocamlmklib.1
diff --git a/debian/rules b/debian/rules
index fcc79fd..d8b667c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,25 +24,30 @@ JOCAML_ABI := $(shell head -1 VERSION)
JOCAML_OPT_ARCH := $(OCAML_OPT_ARCH)
JOCAML_STDLIB_DIR := /usr/lib/jocaml/$(JOCAML_ABI)
-OPTTARGET := $(if $(JOCAML_OPT_ARCH),,opt opt.opt)
-
OCAMLINIT_SED += -e 's/@JOCamlABI@/$(JOCAML_ABI)/g'
-OCAMLINIT_SET += -e 's/@JOCamlStdlibDir@/$(JOCAML_STDLIB_DIR)/g'
+OCAMLINIT_SED += -e 's%@JOCamlStdlibDir@%$(JOCAML_STDLIB_DIR)%g'
+
+OCAMLC := $(if $(wildcard /usr/bin/ocamlc.opt),/usr/bin/ocamlc.opt,/usr/bin/ocamlc)
config-stamp: ocamlinit
dh_testdir
./configure --prefix /usr \
--libdir $(JOCAML_STDLIB_DIR) \
--mandir /usr/share/man \
- --host $(DEB_HOST_GNU_TYPE)
+ --host $(DEB_HOST_GNU_TYPE) \
+ -ocamlc $(OCAMLC) \
+ -no-curses
touch $@
build-arch: config-stamp build-arch-stamp
build-arch-stamp:
if test ! -d boot.debian; then \
- cp -xa boot boot.debian; \
- fi
- $(MAKE) world $(OPTTARGET)
+ cp -xa boot boot.debian; \
+ fi
+ $(MAKE) world
+ifneq ($(JOCAML_OPT_ARCH),)
+ $(MAKE) opt opt.opt
+endif
touch $@
build-indep: config-stamp build-indep-stamp
@@ -73,6 +78,11 @@ ifneq ($(JOCAML_OPT_ARCH),)
endif
mkdir -p $(CURDIR)/debian/tmp/usr
$(MAKE) PREFIX=$(CURDIR)/debian/tmp/usr LIBDIR=$(CURDIR)/debian/tmp/usr/lib/jocaml/$(JOCAML_ABI) install
+ cd $(CURDIR)/debian/tmp/usr/bin; \
+ for i in ocamldep ocamldep.opt ocamlprof ocamlcp ocamlmktop ocamlmklib; do \
+ if [ -e $i ]; then mv $$i j$$i; fi; \
+ done
+
binary-common:
dh_testdir
--
jocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list