[Pkg-ocaml-maint-commits] [SCM] sexplib310 packaging branch, master, updated. debian/4.2.16-1-15-g86af660

Mon Jun 6 20:29:18 UTC 2011

The following commit has been merged in the master branch:
commit 86af660abb8fe701a85ae0b4168753ebec371740
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Mon Jun 6 20:22:54 2011 +0000

    Switch do dh7 build system

diff --git a/debian/changelog b/debian/changelog
index 5853a38..b93f80a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ sexplib310 (5.2.1-1) UNRELEASED; urgency=low
 
   [ Sylvain Le Gall ]
   * Scan www.janestreet.com for new version
+  * Switch do dh7 build system
 
  -- Stéphane Glondu <glondu at debian.org>  Fri, 18 Feb 2011 07:35:13 +0100
 
diff --git a/debian/control b/debian/control
index f473799..5e86336 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,11 @@ Uploaders:
  Sylvain Le Gall <gildor at debian.org>
 Build-Depends:
  debhelper (>= 8),
- cdbs,
- ocaml-nox (>= 3.11.1),
+ ocaml-nox (>= 3.12.0),
  ocaml-findlib (>= 1.2.4-2),
  camlp4,
  camlp4-extra,
- libtype-conv-camlp4-dev (>> 1.6.7-2),
+ libtype-conv-camlp4-dev (>= 2.3.0),
  dh-ocaml (>= 0.9~)
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/sexplib310.git
diff --git a/debian/docs b/debian/docs
index 71dfd5b..e845566 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README.txt
+README
diff --git a/debian/patches/0001-add-Makefile-targets-to-build-install-bytecode-objec.patch b/debian/patches/0001-add-Makefile-targets-to-build-install-bytecode-objec.patch
deleted file mode 100644
index 5c06291..0000000
--- a/debian/patches/0001-add-Makefile-targets-to-build-install-bytecode-objec.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Mon, 9 Nov 2009 13:42:53 +0100
-Subject: [PATCH] add Makefile targets to build/install bytecode objects only
-
----
- Makefile      |    9 +++++++++
- OCamlMakefile |    2 +-
- lib/Makefile  |    5 +++++
- 3 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1e10a55..fa74069 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,10 +3,19 @@ all:
- 	@cd lib && $(MAKE)
- 	@cd lib_test && $(MAKE)
- 
-+.PHONY: byte
-+byte:
-+	@cd lib && $(MAKE) byte
-+	@cd lib_test && make
-+
- .PHONY:	install
- install:
- 	@cd lib && $(MAKE) $@
- 
-+.PHONY:	libinstall-byte-code
-+libinstall-byte-code:
-+	@cd lib && $(MAKE) $@
-+
- .PHONY:	uninstall
- uninstall:
- 	@cd lib && $(MAKE) $@
-diff --git a/OCamlMakefile b/OCamlMakefile
-index e9deb24..86ba1a9 100644
---- a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -1216,7 +1216,7 @@ libinstall:	all
- 	$(QUIET)printf "\nInstallation successful.\n"
- 
- .PHONY: libinstall-byte-code
--libinstall-byte-code:	all
-+libinstall-byte-code:	byte-code
- 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
- 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
- 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
-diff --git a/lib/Makefile b/lib/Makefile
-index bc19bc3..f466b05 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -25,6 +25,11 @@ all: \
- 	sexplib.cma sexplib.cmxa \
- 	pa_sexp_conv.cmi pa_sexp_conv.cmo
- 
-+byte: \
-+	pack-byte-code toplevel-library \
-+	sexplib.cma \
-+	pa_sexp_conv.cmi pa_sexp_conv.cmo
-+
- toplevel-library:	byte-code-library \
- 			install_printers.cmi install_printers.cmo
- 	$(OCAMLC) -a -o sexplib_top.cma sexplib.cma install_printers.cmo
--- 
diff --git a/debian/patches/0002-add-missing-META-dependencies.patch b/debian/patches/0002-add-missing-META-dependencies.patch
deleted file mode 100644
index 01807a6..0000000
--- a/debian/patches/0002-add-missing-META-dependencies.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Mon, 9 Nov 2009 13:43:42 +0100
-Subject: [PATCH] add missing META dependencies
-
----
- lib/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index f466b05..a851f89 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -12,7 +12,7 @@ SOURCES = \
-   conv_error.ml
- LIB_PACK_NAME = sexplib
- INCDIRS = +camlp4
--PACKS = type-conv
-+PACKS = type-conv bigarray num
- RESULT = sexplib
- 
- TRASH = \
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 39b34fd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-add-Makefile-targets-to-build-install-bytecode-objec.patch
-0002-add-missing-META-dependencies.patch
diff --git a/debian/rules b/debian/rules
index b428c1f..12222dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,32 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-LIB_NAME = sexplib
-PKG_NAME = lib$(LIB_NAME)-camlp4-dev
-DESTDIR = $(CURDIR)/debian/$(PKG_NAME)$(OCAML_STDLIB_DIR)
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET = all
-DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR)"
-else
-DEB_MAKE_BUILD_TARGET = byte
-DEB_MAKE_INSTALL_TARGET = libinstall-byte-code OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR)"
-endif
-
-OCAML_OCAMLDOC_PACKAGES = $(PKG_NAME)
-OCAML_OCAMLDOC_FLAGS_HTML += -I $(CURDIR)/lib
-
-build/$(PKG_NAME)::
-	mkdir -p $(DESTDIR)
+
+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)' 
+
+.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 
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	ocaml setup.ml -distclean

-- 
sexplib310 packaging

