[Pkg-ocaml-maint-commits] [bin-prot] 08/09: Update packaging

Thu Jul 28 13:36:46 UTC 2016

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository bin-prot.

commit 326df878bdd51c82d30e1af357a1c9cbc0eb84ab
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 28 14:58:42 2016 +0200

    Update packaging
---
 debian/clean                            |  1 +
 debian/control                          | 35 +++++++++++++++++++++++++++++----
 debian/libbin-prot-camlp4-dev.ocamldoc  |  6 ------
 debian/libbin-prot-ocaml-dev.install.in |  6 ++++++
 debian/libbin-prot-ocaml-dev.ocamldoc   |  0
 debian/libbin-prot-ocaml.install.in     |  4 ++++
 debian/rules                            | 29 +++------------------------
 7 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..7ec1fdc
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+setup.exe
diff --git a/debian/control b/debian/control
index da0a702..de58d6f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,10 @@ Build-Depends:
  dh-ocaml (>= 0.9~),
  ocaml-nox (>= 4.00.0),
  ocaml-findlib (>= 1.3.2),
- camlp4,
- camlp4-extra,
+ oasis,
+ opam,
+ libjs-build-tools-ocaml-dev,
+ libfindlib-ocaml-dev,
  libtype-conv-camlp4-dev (>= 3.0.5),
  libounit-ocaml-dev (>= 1.1.0-3~)
 Standards-Version: 3.9.8
@@ -20,7 +22,7 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/bin-prot.gi
 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/bin-prot.git
 Homepage: http://janestreet.github.io/
 
-Package: libbin-prot-camlp4-dev
+Package: libbin-prot-ocaml-dev
 Architecture: any
 Depends:
  ${ocaml:Depends},
@@ -30,7 +32,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${ocaml:Provides}
-Description: type-safe binary serialization for OCaml values
+Description: type-safe binary serialization for OCaml values (dev files)
  bin-prot provides functionalities for reading and writing OCaml-values
  in a type-safe binary protocol.
  .
@@ -41,4 +43,29 @@ Description: type-safe binary serialization for OCaml values
  .
  There is no support for cyclic or shared values and only little endian
  computer architectures are supported.
+ .
+ This package contains development files.
 
+Package: libbin-prot-ocaml
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ocaml-findlib,
+ camlp4,
+ libtype-conv-camlp4-dev,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: type-safe binary serialization for OCaml values (runtime)
+ bin-prot provides functionalities for reading and writing OCaml-values
+ in a type-safe binary protocol.
+ .
+ These functions provide a safe way of performing I/O on any
+ extensionally defined data type. Functions, objects, and values whose
+ type is bound through a polymorphic record field are not supported, but
+ everything else is.
+ .
+ There is no support for cyclic or shared values and only little endian
+ computer architectures are supported.
+ .
+ This package contains runtime files.
diff --git a/debian/libbin-prot-camlp4-dev.ocamldoc b/debian/libbin-prot-camlp4-dev.ocamldoc
deleted file mode 100644
index 6c60302..0000000
--- a/debian/libbin-prot-camlp4-dev.ocamldoc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Not all *.cmi files are installed into the package, the following
-# lines avoid "Unbound module" errors. FIXME: Is there a better way?
--I _build/lib/
-
-# Some files contain C preprocessor statements
--pp "gcc -O -fno-defer-pop -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT -O -fPIC -E -xc -undef -w -DJSC_ARCH_SIXTYFOUR"
diff --git a/debian/libbin-prot-ocaml-dev.install.in b/debian/libbin-prot-ocaml-dev.install.in
new file mode 100644
index 0000000..164f41c
--- /dev/null
+++ b/debian/libbin-prot-ocaml-dev.install.in
@@ -0,0 +1,6 @@
+ at OCamlStdlibDir@/bin_prot/*.annot
+ at OCamlStdlibDir@/bin_prot/*.cmi
+ at OCamlStdlibDir@/bin_prot/*.cmt*
+ at OCamlStdlibDir@/bin_prot/*.a
+OPT: @OCamlStdlibDir@/bin_prot/*.cmx
+OPT: @OCamlStdlibDir@/bin_prot/*.cmxa
diff --git a/debian/libbin-prot-ocaml-dev.ocamldoc b/debian/libbin-prot-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..e69de29
diff --git a/debian/libbin-prot-ocaml.install.in b/debian/libbin-prot-ocaml.install.in
new file mode 100644
index 0000000..66b5d56
--- /dev/null
+++ b/debian/libbin-prot-ocaml.install.in
@@ -0,0 +1,4 @@
+ at OCamlDllDir@
+ at OCamlStdlibDir@/bin_prot/META
+ at OCamlStdlibDir@/bin_prot/*.cma
+DYN: @OCamlStdlibDir@/bin_prot/*.cmxs
diff --git a/debian/rules b/debian/rules
index e5ce270..7030d9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,14 @@
 #!/usr/bin/make -f
 
-DESTDIR=$(CURDIR)/debian/libbin-prot-camlp4-dev
-
 include /usr/share/ocaml/ocamlvars.mk
 
-export OCAML_DLL_DIR
-export OCAML_HAVE_OCAMLOPT
-export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
-export OCAMLFIND_LDCONF=ignore
-
 %:
 	dh $@ --with ocaml
 
-.PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libbin-prot-camlp4-dev/html/api
-
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
-	ocaml setup.ml -build
-	ocaml setup.ml -doc
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-	ocaml setup.ml -test
 
-.PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	mkdir -p '$(DESTDIR)$(OCAML_DLL_DIR)'
-	ocaml setup.ml -install
-	rm -f '$(DESTDIR)$(OCAML_DLL_DIR)'/*.so.owner
+	opam-installer --prefix=debian/tmp --libdir=.$(OCAML_STDLIB_DIR) --stubsdir=.$(OCAML_DLL_DIR) bin_prot.install
 
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	ocaml setup.ml -distclean
+override_dh_install:
+	dh_install --fail-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/bin-prot.git

