[Pkg-ocaml-maint-commits] [SCM] ceve packaging branch, master, updated. debian/1.4-1-5-gb97283d

[Ralf Treinen]

The following commit has been merged in the master branch:
commit b97283d4d6247410889038eae3b79bf7c1460244
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Oct 15 08:06:21 2010 +0200

    convert to dh, dh_ocaml for dependencies

diff --git a/debian/changelog b/debian/changelog
index c3a077b..3acc986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
 ceve (1.4-2) UNRELEASED; urgency=low
 
   * Convert to source format 3.0 (quilt)
-  * Standards-Version 3.8.3 (no change)
+  * Standards-Version 3.9.1 (no change)
+  * Convert from cdbs to dh, dh_ocaml >= 0.9~ (closes: #599296)
+    - bump build-dependency on debhelper to have overrides.
+    - bump build-dependency on ocaml to have checksums of ABIs
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 22 Nov 2009 21:25:37 +0100
+ -- Ralf Treinen <treinen at debian.org>  Sun, 17 Oct 2010 18:45:20 +0200
 
 ceve (1.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 44edf3d..361aed9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,20 +4,18 @@ 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, ocaml-findlib,
+Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~),
+ ocaml-nox (>= 3.11.1-3~), ocaml-findlib,
  libdose2-ocaml-dev (>= 1.4.2),
  libexpat-ocaml-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.9.1
 Homepage: http://sodiac.gforge.inria.fr/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ceve.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ceve.git
 
 Package: ceve
 Architecture: any
-Depends: ${F:OCamlInterpDepends},
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: utility to parse package dependencies as set of constraints
  Ceve is a command line utility used to parse package metadata
  information (in particular package interrelationships such as
diff --git a/debian/rules b/debian/rules
index 42497df..5ccc797 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,21 @@
 #!/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
 
-BIN_PKG = ceve
+OPTCOMPILER=/usr/bin/ocamlopt
 
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET = opt
-else
-DEB_MAKE_BUILD_TARGET = all
+%:
+	dh $@ --with ocaml
 
-DEB_DH_GENCONTROL_ARGS += -VF:OCamlInterpDepends="ocaml-base-nox-$(OCAML_ABI), libdose2-ocaml, libexpat-ocaml"
-DEB_STRIP_EXCLUDE += usr/bin/ceve
-endif
-DEB_MAKE_INSTALL_TARGET = install BINDIR=$(CURDIR)/debian/$(BIN_PKG)/usr/bin
+override_dh_auto_build:	
+	if [ -x $(OPTCOMPILER) ]; \
+		then $(MAKE) opt; \
+		else $(MAKE) all; \
+        fi
 
+override_dh_auto_install:
+	$(MAKE) install BINDIR=debian/ceve/usr/bin
+
+override_dh_strip:
+	if [ -x $(OPTCOMPILER) ]; \
+		then dh_strip; \
+		else dh_strip -X usr/bin/ceve; \
+        fi

-- 
ceve packaging