From: Stefano Zacchiroli Date: Sat, 14 Apr 2007 18:23:15 +0000 (+0000) Subject: delegated more stuff to dh_install X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~585^2~15 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=021f8015d50904c76eb66304cf11570634ed1a71;p=ocaml.git delegated more stuff to dh_install --- diff --git a/debian/changelog b/debian/changelog index a54923f0..2159d20c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,19 +18,21 @@ ocaml (3.10.0~beta-1) UNRELEASED; urgency=low * Policy - mandate the compilation of *.cm[ao] with debugging information for libraries and forbid it for bytecode programs - + * debian/rules + - delegated more installation stuff to dh_install + [Ralf Treinen] * debian/patches/* - added: install_scripts_config: use a patched config.sh since PREFIX is diferent at compile time and at installation time - - added: ocaml-interp_manpage, fixes typo in ocaml manpage + - added: ocaml-interp_manpage, fixes typo in ocaml manpage (closes: Bug#417847). * debian/rules: - added creation of config/config.debian.install - Patch LIBDIR and STBLIBDIR setting in config/Makefile after invokation of configure - -- Ralf Treinen Wed, 11 Apr 2007 16:37:21 +0200 + -- Stefano Zacchiroli Sat, 14 Apr 2007 20:22:15 +0200 ocaml (3.09.3-1) experimental; urgency=low diff --git a/debian/ocaml-base-nox.install.in b/debian/ocaml-base-nox.install.in new file mode 100644 index 00000000..9a9bab36 --- /dev/null +++ b/debian/ocaml-base-nox.install.in @@ -0,0 +1 @@ +debian/ld.conf /usr/lib/ocaml/#OcamlABI#/ diff --git a/debian/ocaml-compiler-libs.install.in b/debian/ocaml-compiler-libs.install.in new file mode 100644 index 00000000..26bb2d28 --- /dev/null +++ b/debian/ocaml-compiler-libs.install.in @@ -0,0 +1,4 @@ +debian/ocaml-compiler-libs.override /usr/share/lintian/overrides/ocaml-compiler-libs +parsing/* /usr/lib/ocaml/#OcamlABI#/compiler-libs/ +typing/* /usr/lib/ocaml/#OcamlABI#/compiler-libs/ +utils/* /usr/lib/ocaml/#OcamlABI#/compiler-libs/ diff --git a/debian/ocaml-interp.install.in b/debian/ocaml-interp.install.in new file mode 100644 index 00000000..7c964b5a --- /dev/null +++ b/debian/ocaml-interp.install.in @@ -0,0 +1 @@ +debian/ocaml.xpm /usr/share/pixmaps diff --git a/debian/ocaml-nox.install b/debian/ocaml-nox.install deleted file mode 100644 index 630bc52a..00000000 --- a/debian/ocaml-nox.install +++ /dev/null @@ -1 +0,0 @@ -debian/cdbs/*.mk /usr/share/cdbs/1/class/ diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in new file mode 100644 index 00000000..45b43d77 --- /dev/null +++ b/debian/ocaml-nox.install.in @@ -0,0 +1,4 @@ +debian/cdbs/*.mk /usr/share/cdbs/1/class/ +debian/ocaml-nox.override /usr/share/lintian/overrides/ocaml-nox +config/Makefile /usr/lib/ocaml/#OcamlABI#/config/Makefile +debian/native-archs /usr/lib/ocaml/#OcamlABI#/ diff --git a/debian/ocaml.docs b/debian/ocaml.docs index 06c36a06..78b99c6f 100644 --- a/debian/ocaml.docs +++ b/debian/ocaml.docs @@ -1,2 +1 @@ -debian/README.labltk otherlibs/labltk/examples_labltk diff --git a/debian/ocaml.install.in b/debian/ocaml.install.in new file mode 100644 index 00000000..b16eef40 --- /dev/null +++ b/debian/ocaml.install.in @@ -0,0 +1 @@ +otherlibs/labltk/README /usr/share/doc/ocaml/README.labltk diff --git a/debian/rules b/debian/rules index 7ba99de9..c8e848c3 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,7 @@ OCAMLMINOR = 0 OCAMLABI = $(OCAMLMAJOR).$(OCAMLMINOR) STDLIBDIR = /usr/lib/ocaml/$(OCAMLABI) MD5SUMSDIR = /var/lib/ocaml/md5sums +INSTDIR = $(CURDIR)/debian/ocaml-nox/usr NATIVE_ARCHS = $(shell cat debian/native-archs) @@ -175,21 +176,8 @@ install-arch: build-arch dh_installdirs -a # Let's install ocaml first. - sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(CURDIR)/debian/usr\"|' < config/config.sh > config/config.debian.install.sh - $(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr - install -m 644 debian/ocaml.xpm \ - $(CURDIR)/debian/ocaml-interp/usr/share/pixmaps - install -m 644 debian/ocaml-nox.override \ - $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox - install -m 644 debian/ocaml-compiler-libs.override \ - $(CURDIR)/debian/ocaml-compiler-libs/usr/share/lintian/overrides/ocaml-compiler-libs - install -m 644 otherlibs/labltk/README \ - $(CURDIR)/debian/README.labltk - install -m 644 config/Makefile \ - $(CURDIR)/debian/ocaml-nox/usr/lib/ocaml/$(OCAMLABI)/config/Makefile - - # Install the list of archs with ocamlopt - install -m 644 debian/native-archs $(CURDIR)/debian/ocaml-nox$(STDLIBDIR) + sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(INSTDIR)"|' < config/config.sh > config/config.debian.install.sh + $(MAKE) install PREFIX=$(INSTDIR) # Now move the graphics files over if [ -e opt-built-stamp ]; then \ @@ -203,8 +191,6 @@ install-arch: build-arch # Then move the ocaml-base-nox package. dh_movefiles -pocaml-base-nox --sourcedir=debian/ocaml-nox - install -m 644 debian/ld.conf \ - $(CURDIR)/debian/ocaml-base-nox/usr/lib/ocaml/$(OCAMLABI) # And base's corresponding graphics stuff. dh_movefiles -pocaml-base --sourcedir=debian/ocaml-nox @@ -220,17 +206,6 @@ install-arch: build-arch # The interpreter files dh_movefiles -pocaml-interp --sourcedir=debian/ocaml-nox - # Some extra stuff - install -m 644 utils/*.mli utils/*.cmi utils/*.cmo \ - typing/*.mli typing/*.cmi typing/*.cmo \ - parsing/*.mli parsing/*.cmi parsing/*.cmo \ - $(CURDIR)/debian/ocaml-compiler-libs/usr/lib/ocaml/$(OCAMLABI)/compiler-libs - if [ -e opt-built-stamp ]; then \ - install -m 644 utils/*.cmx utils/*.o typing/*.cmx \ - typing/*.o parsing/*.cmx parsing/*.o \ - $(CURDIR)/debian/ocaml-compiler-libs/usr/lib/ocaml/$(OCAMLABI)/compiler-libs; \ - fi - # Install ocaml-md5sums $(MAKE) -C debian/ocaml-md5sums install DESTDIR=$(CURDIR)/debian/ocaml-base-nox/usr/bin