[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.2-11-23-gf5850e5

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 851f99fc8d5fa4ace92245bb3816523197bf10e2
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Feb 13 12:20:59 2011 +0100

    migrate to dh

diff --git a/debian/changelog b/debian/changelog
index befb3e8..cba3402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,11 @@ pkglab (1.4.2-12) UNRELEASED; urgency=low
     (closes: #582951). Thanks a lot to Andi Barth for the idea!
   * Fix a typo in the long description of edos-distcheck (closes: #603831).
   * Standards-Version: 3.9.1 (no change).
+  * Migrate packaging from cdbs to dh.
+  * Use dh_ocaml >= 0.9 to get dependencies on ocaml stuff
+    (closes: #599298).
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 13 Feb 2011 11:12:01 +0100
+ -- Ralf Treinen <treinen at debian.org>  Sun, 13 Feb 2011 12:07:44 +0100
 
 pkglab (1.4.2-11) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 601fca5..75e1468 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,8 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Ralf Treinen <treinen at debian.org>,
  Stéphane Glondu <glondu at debian.org>
-Build-Depends:
- cdbs, debhelper (>= 7),
- ocaml-nox, ocaml-findlib, dh-ocaml,
+Build-Depends: debhelper (>= 7),
+ ocaml-nox, ocaml-findlib, dh-ocaml (>= 0.9),
  menhir,
  libdose2-ocaml-dev (>= 1.4.2),
  libledit-ocaml-dev,
@@ -20,10 +19,7 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pkglab.git
 
 Package: pkglab
 Architecture: any
-Depends:
- ${F:OCamlInterpDepends},
- ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Suggests: ceve
 Description: interactive environment to explore package repositories
  Pkglab is an interactive, console-based environment to explore package
@@ -35,11 +31,8 @@ Description: interactive environment to explore package repositories
 
 Package: edos-distcheck
 Architecture: any
-Depends:
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends},
  python-debian (>= 0.1.11), python, perl,
- ${F:OCamlInterpDepends},
- ${shlibs:Depends},
- ${misc:Depends}
 Conflicts: edos-debcheck (<= 1.0-8), edos-rpmcheck (<= 1.0-8)
 Replaces: edos-debcheck, edos-rpmcheck
 Provides: edos-debcheck, edos-rpmcheck
diff --git a/debian/rules b/debian/rules
index acefc46..44988f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,40 +1,32 @@
 #!/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
 
-PKGLAB_INST = $(CURDIR)/debian/pkglab
-DISTCHECK_INST = $(CURDIR)/debian/edos-distcheck
+# do we have compilation of ocaml to native code?
+OPT = $(shell test -x /usr/bin/ocamlopt && echo true)
 
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
- DEB_MAKE_BUILD_TARGET = depend pkglab.opt
-else
- DEB_MAKE_BUILD_TARGET = depend pkglab
- DEB_DH_GENCONTROL_ARGS += \
-  -VF:OCamlInterpDepends="ocaml-base-nox-$(OCAML_ABI), libdose2-ocaml, libzip-ocaml"
- DEB_STRIP_EXCLUDE += usr/bin/pkglab
-endif
-
-build/pkglab::
-	cd doc && make pkglab.html
+%:
+	dh $@ --with ocaml
 
-build/edos-distcheck::
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	cd distcheck && make distcheck.opt
+override_dh_auto_conigure:
+ifeq ($(OPT),true)
+	$(MAKE) depend pkglab.opt
 else
-	cd distcheck && make distcheck
+	$(MAKE) depend pklab
 endif
 
-install/edos-distcheck::
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	cp distcheck/distcheck.opt $(DISTCHECK_INST)/usr/lib/edos-distcheck/distcheck
+override_dh_auto_build:
+	$(MAKE)
+ifeq ($(OPT),true)
+	cd distcheck && make distcheck.opt
+	cp distcheck.opt distcheck
 else
-	cp distcheck/distcheck $(DISTCHECK_INST)/usr/lib/edos-distcheck/distcheck
+	cd distcheck && make distchec
 endif
+	cd doc && make pkglab.html
 
-clean::
-	cd distcheck && rm -f common.cmi common.cmx common.o distcheck.opt
-	cd doc && rm -rf pkglab.haux pkglab.html
+override_dh_strip:
+ifeq ($(OPT),true)
+	dh_strip
+else	
+	dh_strip -X usr/bin/pkglab
+endif	
 
-DEB_MAKE_INSTALL_TARGET = \
- install DESTDIR=$(PKGLAB_INST)/usr MANDIR=$(PKGLAB_INST)/usr/share/man

-- 
pkglab packaging