[Pkg-ocaml-maint-commits] [SCM] planets packaging branch, master, updated. debian/0.1.13-11-9-g8251d08

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 08ea29a35648a8dea0c941be8f4b18ff6395a1d4
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Feb 15 09:27:35 2011 +0100

    migrate to dh, dh-ocaml >= 0.9

diff --git a/debian/changelog b/debian/changelog
index ed6560f..4088ff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 planets (0.1.13-12) UNRELEASED; urgency=low
 
   [ Ralf Treinen ]
-  * NOT RELEASED YET
+  * debian/rule: migrate to dh
+  * Standards-version: 3.9.1 (no change)
+  * Use dh-ocaml to compute dependency on ocaml runtime.
+  * Bump versions on dh-ocaml and ocaml-nox
 
   [ Stéphane Glondu ]
   * Switch packaging to git
diff --git a/debian/control b/debian/control
index e2d3dc1..f83f04e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,16 +5,16 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Martin Pitt <mpitt at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Ralf Treinen <treinen at debian.org>
-Build-Depends: cdbs, debhelper (>> 5.0.0), ocaml (>= 3.04), dh-ocaml
+Build-Depends: debhelper (>> 5.0.0), ocaml (>= 3.04), dh-ocaml
 Build-Depends-Indep: tk8.5-dev, camlp4
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/planets.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/planets.git
 Homepage: http://planets.homedns.org/
 
 Package: planets
 Architecture: all
-Depends: tk8.5, ocaml-base-${F:OCamlABI}, ${misc:Depends}
+Depends: tk8.5, {ocaml:Depends}, ${misc:Depends}
 Suggests: doc-base
 Description: Gravitation simulation of planetary bodies
  Planets is a simple interactive program for playing with simulations
diff --git a/debian/rules b/debian/rules
index f3ec795..9f3148e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,14 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
+DEB_DESTDIR := $(CURDIR)/debian/planets
 
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        MAKEOPTS:=DEBUGFLAGS=-g
-endif
+%:
+	dh $@ --with ocaml
 
-DEB_MAKE_BUILD_TARGET = $(MAKEOPTS) planets.bc
+override_dh_auto_build:
+	$(MAKE) planets.bc
 
-install/planets::
+override_dh_auto_install:
 	install -D planets.bc $(DEB_DESTDIR)/usr/bin/planets
-	install -D -m 644 $(CURDIR)/debian/README.examples \
+	install -D -m 644 debian/README.examples \
 		$(DEB_DESTDIR)/usr/share/doc/planets/examples/README

-- 
planets packaging