[Pkg-ocaml-maint-commits] [ocamlgsl] 12/15: Update packaging to cope with upstream's build system
Mehdi Dogguy
mehdi at moszumanska.debian.org
Sun Jan 17 19:40:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository ocamlgsl.
commit 54c6a6050af9d48f67146e4e509a6dcf649142e6
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Sun Jan 17 18:12:23 2016 +0100
Update packaging to cope with upstream's build system
---
debian/control | 2 +-
debian/libocamlgsl-ocaml-dev.docs | 4 +--
debian/libocamlgsl-ocaml-dev.install.in | 11 +++++---
debian/libocamlgsl-ocaml.dirs.in | 1 -
debian/libocamlgsl-ocaml.install.in | 4 +++
debian/rules | 48 +++++++++++++++------------------
6 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/debian/control b/debian/control
index 6371a14..1464fd0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Homepage: https://github.com/mmottl/gsl-ocaml
Package: libocamlgsl-ocaml-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${ocaml:Depends}, libocamlgsl-ocaml (= ${binary:Version}), libgsl-dev, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${ocaml:Depends}, libgsl-dev, ${misc:Depends}
Provides: ${ocaml:Provides}
Description: GNU scientific library for OCaml
This is an interface to GSL (GNU scientific library), for the
diff --git a/debian/libocamlgsl-ocaml-dev.docs b/debian/libocamlgsl-ocaml-dev.docs
index 5513064..24d2402 100644
--- a/debian/libocamlgsl-ocaml-dev.docs
+++ b/debian/libocamlgsl-ocaml-dev.docs
@@ -1,2 +1,2 @@
-README
-NOTES
+README.md
+NOTES.md
diff --git a/debian/libocamlgsl-ocaml-dev.install.in b/debian/libocamlgsl-ocaml-dev.install.in
index e55d973..0fc86ef 100644
--- a/debian/libocamlgsl-ocaml-dev.install.in
+++ b/debian/libocamlgsl-ocaml-dev.install.in
@@ -1,3 +1,8 @@
-doc/* /usr/share/doc/libocamlgsl-ocaml-dev/html/api/
-*.mli @OCamlStdlibDir@/gsl/
-META @OCamlStdlibDir@/gsl/
+ at OCamlStdlibDir@/gsl/*.a
+ at OCamlStdlibDir@/gsl/*.ml*
+ at OCamlStdlibDir@/gsl/*.cmi
+ at OCamlStdlibDir@/gsl/*.annot
+ at OCamlStdlibDir@/gsl/*.cmti
+ at OCamlStdlibDir@/gsl/*.cmt
+OPT: @OCamlStdlibDir@/gsl/*.cmx
+OPT: @OCamlStdlibDir@/gsl/*.cmxa
diff --git a/debian/libocamlgsl-ocaml.dirs.in b/debian/libocamlgsl-ocaml.dirs.in
deleted file mode 100644
index a8131b4..0000000
--- a/debian/libocamlgsl-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlDllDir@
diff --git a/debian/libocamlgsl-ocaml.install.in b/debian/libocamlgsl-ocaml.install.in
new file mode 100644
index 0000000..c7e3d00
--- /dev/null
+++ b/debian/libocamlgsl-ocaml.install.in
@@ -0,0 +1,4 @@
+ at OCamlStdlibDir@/gsl/META
+ at OCamlStdlibDir@/gsl/*.cma
+ at OCamlStdlibDir@/gsl/*.so
+OPT: @OCamlStdlibDir@/gsl/*.cmxs
diff --git a/debian/rules b/debian/rules
index a0cc91e..827efb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,38 +1,32 @@
#!/usr/bin/make -f
-%:
- dh $@ --with ocaml
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
- -mv .depend.save .depend
- dh_auto_clean
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET := all-opt
-DEB_MAKE_INSTALL_TARGET := install-opt
-else
-DEB_MAKE_BUILD_TARGET := all-byte
-DEB_MAKE_INSTALL_TARGET := install-byte
-endif
+include /usr/share/ocaml/ocamlvars.mk
-PACKAGE_DEV := libocamlgsl-ocaml-dev
-DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
+export OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
+export OCAMLFIND_LDCONF=ignore
-PACKAGE := libocamlgsl-ocaml
-DESTDIR := $(CURDIR)/debian/$(PACKAGE)
+%:
+ dh $@ --with ocaml
-DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+ ./configure \
+ --enable-tests \
+ --enable-docs \
+ --enable-debug \
+ --docdir $(CURDIR)/debian/libocamlgsl-ocaml-dev/usr/share/doc/libocamlgsl-ocaml-dev/html/ \
+ --prefix $(OCAMLFIND_DESTDIR)
.PHONY: override_dh_auto_build
override_dh_auto_build:
- -cp .depend .depend.save
- $(MAKE) $(DEB_MAKE_BUILD_TARGET)
+ ocaml setup.ml -build
+ ocaml setup.ml -doc
.PHONY: override_dh_auto_install
override_dh_auto_install:
- $(MAKE) $(DEB_MAKE_INSTALL_TARGET)
- $(RM) -r '$(DESTDIR_DEV)/$(OCAML_DLL_DIR)'
- mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/*.so \
- '$(DESTDIR)/$(OCAML_DLL_DIR)'
- chrpath -d $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/*.so
+ mkdir -p $(OCAMLFIND_DESTDIR)
+ dh_auto_install
+
+.PHONY: override_dh_install
+override_dh_install:
+ dh_install --fail-missing -X.so.owner
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlgsl.git
More information about the Pkg-ocaml-maint-commits
mailing list