[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.4.2-1-11-g4fb8762

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 4f08c2edbb5a0e828256532b36c4370d94090f85
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Feb 10 07:52:14 2011 +0100

    switch to dh

diff --git a/debian/changelog b/debian/changelog
index 3cdda65..9ad36cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-dose2 (1.4.2-2) UNRELEASED; urgency=low
+dose2 (1.4.2-2) unstable; urgency=low
 
   * Make short descriptions of  libdose2-ocaml and  libdose2-ocaml-dev
     different.
   * Standards-version 3.8.4 (no change).
+  * debian/rules: switch from cdbs to debhelper > 7, dh.
+  * Build-depend on dh_ocaml (>= 0.9.0),  ocaml-nox (>=3.11.1-3~), remove
+    cdbs.
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 03 Feb 2010 22:10:47 +0100
+ -- Ralf Treinen <treinen at debian.org>  Thu, 10 Feb 2011 07:49:33 +0100
 
 dose2 (1.4.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c49969a..970691e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>,
  Ralf Treinen <treinen at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), dh-ocaml,
- ocaml-nox, camlp4,
+Build-Depends: debhelper (>= 7), dh-ocaml (>= 0.9.0),
+ ocaml-nox (>=3.11.1-3~), camlp4,
  ocaml-findlib, menhir,
  librpm-dev,
  libpcre-ocaml-dev,
diff --git a/debian/rules b/debian/rules
index 6d89e68..87f2d0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,25 @@
 #!/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
 
-LIB_NAME = dose2
-DLL_PKG_NAME = lib$(LIB_NAME)-ocaml
-DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
-DEB_MAKE_BUILD_TARGET = depend all
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
+%:
+	dh $@ --with ocaml
 
-configure/$(DEV_PKG_NAME):: debian/configure-stamp
+#include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/class/makefile.mk
+#include /usr/share/cdbs/1/rules/ocaml.mk
 
-debian/configure-stamp:
-	./configure
-	touch $@
+#LIB_NAME = dose2
+#DLL_PKG_NAME = lib$(LIB_NAME)-ocaml
+#DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
+#DEB_MAKE_BUILD_TARGET = depend all
+#DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
 
-clean::
-	rm -f debian/configure-stamp
+#configure/$(DEV_PKG_NAME):: debian/configure-stamp
 
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
+#debian/configure-stamp:#
+#	./configure
+#touch $@
+
+#clean::
+#	rm -f debian/configure-stamp
+
+#OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)

-- 
dose2 packaging