[Pkg-ocaml-maint-commits] [fieldslib] 06/07: 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 fieldslib.

commit 1329d9faf50ce0dc6ee396b44f5862fe90884d8a
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 28 16:42:31 2016 +0200

    Update packaging
---
 debian/clean                                       |  1 +
 debian/control                                     | 32 +++++++++++++++++-----
 debian/docs                                        |  1 -
 ...4-dev.ocamldoc => libfields-ocaml-dev.ocamldoc} |  0
 debian/libfieldslib-ocaml-dev.install.in           |  6 ++++
 debian/libfieldslib-ocaml.install.in               |  3 ++
 debian/rules                                       | 27 ++----------------
 7 files changed, 38 insertions(+), 32 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 05eacb7..7324329 100644
--- a/debian/control
+++ b/debian/control
@@ -10,25 +10,25 @@ Build-Depends:
  debhelper (>= 9),
  ocaml-nox (>= 4.00.0),
  ocaml-findlib (>= 1.3.2),
- camlp4,
- camlp4-extra,
- libtype-conv-camlp4-dev (>= 109.20.00),
+ 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/fieldslib.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/fieldslib.git
 Homepage: http://janestreet.github.io/
 
-Package: libfields-camlp4-dev
+Package: libfieldslib-ocaml-dev
 Architecture: any
 Depends:
  ocaml-findlib,
- camlp4,
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${ocaml:Provides}
-Description: OCaml syntax extension that enables folding over record fields
+Description: OCaml syntax extension that enables folding over record fields (dev files)
  fieldslib is an OCaml syntax extension that can be used to define
  first class values representing record fields. On top of those
  values additional routines can then be automatically defined to:
@@ -37,4 +37,22 @@ Description: OCaml syntax extension that enables folding over record fields
   - iterate and fold over fields
   - create new record values
  .
- fieldslib is built on top of CamlP4.
+ This package contains development files.
+
+Package: libfieldslib-ocaml
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml syntax extension that enables folding over record fields (runtime files)
+ fieldslib is an OCaml syntax extension that can be used to define
+ first class values representing record fields. On top of those
+ values additional routines can then be automatically defined to:
+ .
+  - get and set record fields
+  - iterate and fold over fields
+  - create new record values
+ .
+ This package contains runtime files.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 71dfd5b..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.txt
diff --git a/debian/libfields-camlp4-dev.ocamldoc b/debian/libfields-ocaml-dev.ocamldoc
similarity index 100%
rename from debian/libfields-camlp4-dev.ocamldoc
rename to debian/libfields-ocaml-dev.ocamldoc
diff --git a/debian/libfieldslib-ocaml-dev.install.in b/debian/libfieldslib-ocaml-dev.install.in
new file mode 100644
index 0000000..bf16fcb
--- /dev/null
+++ b/debian/libfieldslib-ocaml-dev.install.in
@@ -0,0 +1,6 @@
+ at OCamlStdlibDir@/fieldslib/*.annot
+ at OCamlStdlibDir@/fieldslib/*.cmi
+ at OCamlStdlibDir@/fieldslib/*.cmt*
+ at OCamlStdlibDir@/fieldslib/*.a
+OPT: @OCamlStdlibDir@/fieldslib/*.cmx
+OPT: @OCamlStdlibDir@/fieldslib/*.cmxa
diff --git a/debian/libfieldslib-ocaml.install.in b/debian/libfieldslib-ocaml.install.in
new file mode 100644
index 0000000..d03d203
--- /dev/null
+++ b/debian/libfieldslib-ocaml.install.in
@@ -0,0 +1,3 @@
+ at OCamlStdlibDir@/fieldslib/META
+ at OCamlStdlibDir@/fieldslib/*.cma
+DYN: @OCamlStdlibDir@/fieldslib/*.cmxs
diff --git a/debian/rules b/debian/rules
index cc4bea3..2f1977c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,14 @@
 #!/usr/bin/make -f
 
-DESTDIR=$(CURDIR)/debian/libfields-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/libfields-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) fieldslib.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/fieldslib.git