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

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository sexplib310.

commit 6a6cc616ce2eeab8b39b49f41b87341dd8d5f634
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 28 15:46:36 2016 +0200

    Update packaging
---
 debian/clean                           |  1 +
 debian/control                         | 41 +++++++++++++++++++++-------------
 debian/docs                            |  1 -
 debian/libsexplib-ocaml-dev.docs       |  1 +
 debian/libsexplib-ocaml-dev.install.in |  6 +++++
 debian/libsexplib-ocaml.install.in     |  3 +++
 debian/rules                           | 24 +++-----------------
 7 files changed, 40 insertions(+), 37 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 057e22f..44be0fa 100644
--- a/debian/control
+++ b/debian/control
@@ -8,18 +8,18 @@ Build-Depends:
  debhelper (>= 9),
  ocaml-nox (>= 4.00.0),
  ocaml-findlib (>= 1.3.2),
- camlp4,
- camlp4-extra,
- libtype-conv-camlp4-dev (>= 113),
+ oasis,
+ opam,
+ libjs-build-tools-ocaml-dev,
+ libfindlib-ocaml-dev,
  dh-ocaml (>= 0.9~)
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/sexplib310.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/sexplib310.git
 Homepage: http://janestreet.github.io/
 
-Package: libsexplib-camlp4-dev
+Package: libsexplib-ocaml-dev
 Provides:
- libsexplib-ocaml-dev,
  ${ocaml:Provides}
 Architecture: any
 Depends:
@@ -28,19 +28,30 @@ Depends:
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Description: automated conversions between OCaml-values and S-expressions
+Description: automated conversions between OCaml-values and S-expressions (dev files)
  Sexplib library contains functionality for parsing and pretty-printing
  S-expressions.
  .
- Sexplib also contains a preprocessing module for Camlp4, which can be
- used to automatically generate code from type definitions for
- efficiently converting OCaml-values to S-expressions and vice versa.
- In combination with the parsing and pretty-printing functionality this
- frees users from having to write their own I/O-routines for the
- datastructures they define.  Possible errors during automatic
- conversions from S-expressions to OCaml-values are reported in a very
- human-readable way.
- .
  Another module contained in Sexplib you to extract and replace
  sub-expressions in S-expressions.
+ .
+ This package contains development files.
 
+Package: libsexplib-ocaml
+Provides:
+ ${ocaml:Provides}
+Architecture: any
+Depends:
+ ocaml-findlib,
+ camlp4,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: automated conversions between OCaml-values and S-expressions (runtime)
+ Sexplib library contains functionality for parsing and pretty-printing
+ S-expressions.
+ .
+ Another module contained in Sexplib you to extract and replace
+ sub-expressions in S-expressions.
+ .
+ This package contains runtime files.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/libsexplib-ocaml-dev.docs b/debian/libsexplib-ocaml-dev.docs
new file mode 100644
index 0000000..f20153b
--- /dev/null
+++ b/debian/libsexplib-ocaml-dev.docs
@@ -0,0 +1 @@
+README.org
diff --git a/debian/libsexplib-ocaml-dev.install.in b/debian/libsexplib-ocaml-dev.install.in
new file mode 100644
index 0000000..59a603f
--- /dev/null
+++ b/debian/libsexplib-ocaml-dev.install.in
@@ -0,0 +1,6 @@
+ at OCamlStdlibDir@/sexplib/*.annot
+ at OCamlStdlibDir@/sexplib/*.cmi
+ at OCamlStdlibDir@/sexplib/*.cmt*
+ at OCamlStdlibDir@/sexplib/*.a
+OPT: @OCamlStdlibDir@/sexplib/*.cmx
+OPT: @OCamlStdlibDir@/sexplib/*.cmxa
diff --git a/debian/libsexplib-ocaml.install.in b/debian/libsexplib-ocaml.install.in
new file mode 100644
index 0000000..4e1a178
--- /dev/null
+++ b/debian/libsexplib-ocaml.install.in
@@ -0,0 +1,3 @@
+ at OCamlStdlibDir@/sexplib/META
+ at OCamlStdlibDir@/sexplib/*.cma
+DYN: @OCamlStdlibDir@/sexplib/*.cmxs
diff --git a/debian/rules b/debian/rules
index 3ec8011..18c475a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,31 +2,13 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 
-DESTDIR=$(CURDIR)/debian/libsexplib-camlp4-dev
-OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
-export OCAMLFIND_DESTDIR
-
 %:
 	dh $@ --with ocaml
 
-.PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libsexplib-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)'
-	ocaml setup.ml -install 
+	opam-installer --prefix=debian/tmp --libdir=.$(OCAML_STDLIB_DIR) sexplib.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/sexplib310.git