[Pkg-ocaml-maint-commits] [SCM] xmlm packaging branch, master, updated. debian/1.0.2-1-11-gbee1046

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0e0966a9c33a1ef6489c9d3ddf1453762b58d57c
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Apr 8 18:30:37 2012 +0200

    Adapt to new upstream build system

diff --git a/debian/libxmlm-ocaml-dev.install.in b/debian/libxmlm-ocaml-dev.install.in
index 9ff9f9f..73752c9 100644
--- a/debian/libxmlm-ocaml-dev.install.in
+++ b/debian/libxmlm-ocaml-dev.install.in
@@ -1,4 +1 @@
- at OCamlStdlibDir@/xmlm/META
- at OCamlStdlibDir@/xmlm/*.cm*
- at OCamlStdlibDir@/xmlm/*.ml*
-OPT: @OCamlStdlibDir@/xmlm/*.o
+usr
diff --git a/debian/rules b/debian/rules
index 78e4ade..d9a63d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,35 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
-
-# In order to regenerate 'debian/control' :
-#   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
-DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
-DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_DH_INSTALL_ARGS :=  --list-missing
-
-build/libxmlm-ocaml-dev::
-	mkdir -p $(DESTDIR)
-	if [ -x /usr/bin/ocamlopt ]; then\
-	  INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build module; \
-	  INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build install; \
-	else\
-	  INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build module-byte; \
-	  INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build install-byte; \
-	fi
-	INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build doc
-
-clean::
-	INSTALLDIR=$(DESTDIR)/xmlm ./build clean
-	rm -rf .pc
+DESTDIR=$(CURDIR)/debian/tmp
+include /usr/share/ocaml/ocamlvars.mk
+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)' --enable-tests
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	ocaml setup.ml -build
+
+.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_install
+override_dh_install:
+	dh_install --fail-missing
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	ocaml setup.ml -distclean

-- 
xmlm packaging