[Pkg-ocaml-maint-commits] [SCM] type-conv packaging branch, master, updated. debian/2.0.2-1-4-ga8f626f

[Sylvain Le Gall]

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

    Migrate to dh7

diff --git a/debian/changelog b/debian/changelog
index 3632c3d..2beae5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ type-conv (2.3.0-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Scan www.janestreet.com for new versions
+  * Migrate to dh7
 
  -- Sylvain Le Gall <gildor at debian.org>  Mon, 06 Jun 2011 19:12:56 +0000
 
diff --git a/debian/control b/debian/control
index bb5a8ec..6ab523b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ Uploaders:
  Stéphane Glondu <glondu at debian.org>,
  Sylvain Le Gall <gildor at debian.org>
 Build-Depends:
- cdbs,
- debhelper (>= 7),
- ocaml-nox (>= 3.11.1-3~),
+ debhelper (>= 7.0.50~),
+ ocaml-nox (>= 3.12.0),
  ocaml-findlib (>= 1.2.5),
  camlp4,
  camlp4-extra,
@@ -16,7 +15,7 @@ Build-Depends:
 Standards-Version: 3.9.2
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/type-conv.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/type-conv.git
-Homepage: http://www.ocaml.info/home/ocaml_sources.html#type-conv
+Homepage: http://ocaml.janestcapital.com/?q=node/13
 
 Package: libtype-conv-camlp4-dev
 Architecture: any
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/rules b/debian/rules
index 25bfc1c..c8aa5c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,32 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
-LIB_NAME = type-conv
-PKG_NAME = lib$(LIB_NAME)-camlp4-dev
-DESTDIR = $(CURDIR)/debian/$(PKG_NAME)$(OCAML_STDLIB_DIR)
+include /usr/share/ocaml/ocamlvars.mk
 
-DEB_MAKE_BUILD_TARGET = all
-DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS="-destdir $(DESTDIR)"
+DESTDIR=$(CURDIR)/debian/libtype-conv-camlp4-dev
+OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
 
-OCAML_DHOCAML_FLAGS := --runtime-map=libtype-conv-camlp4-dev
+%:
+	dh --with ocaml $@
 
-build/$(PKG_NAME)::
-	mkdir -p $(DESTDIR)
+.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

-- 
type-conv packaging