[Pkg-ocaml-maint-commits] [SCM] cmigrep packaging branch, master, updated. debian/1.5-7-18-g3bda313

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 3bda313300bf90e3deedc309d14481aa8ae31762
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Mar 20 11:21:08 2011 +0100

    drop dh-ocaml for now

diff --git a/debian/changelog b/debian/changelog
index d4580ff..7c61792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,6 @@ cmigrep (1.5-8) UNRELEASED; urgency=low
   * Standards-Version 3.9.1 (no change)
   * Migrate to dh, drop build-dependency on cdbs, bump version
     of build-dependency on debhelper
-  * Use dh-ocaml for ocaml dependencies, bump version of dh-ocaml and ocaml-nox
-    accordingly (closes: #599298)
   * build target: we do not have not set the GOBI_LIB variable since
     reference to it is removed by patch
   * Convert to source format 3.0, drop quilt from build-dependencies.
diff --git a/debian/control b/debian/control
index 02c033e..26b16a5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ralf Treinen <treinen at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Mehdi Dogguy <mehdi at debian.org>,
  Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~)
+Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: ocaml-nox (>= 3.11.1-3~),
  libpcre-ocaml-dev (>= 6.0.1),
  ocaml-findlib (>= 1.2.4-2),
@@ -20,7 +20,8 @@ Homepage: http://homepage.mac.com/letaris/
 
 Package: cmigrep
 Architecture: all
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends: ${misc:Depends},
+  ocaml-base-nox-${F:OCamlABI}, libpcre-ocaml (>= 6.2.2-1)
 Conflicts: ocaml-tools (<= 2007.02.04-2)
 Replaces: ocaml-tools
 Description: search in OCaml compiled interface files
diff --git a/debian/rules b/debian/rules
index c4f4a28..44eb338 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
 DOCDIR = debian/cmigrep/usr/share/doc/cmigrep
+OCAMLABI := $(shell ocamlc -version)
 
 %:
-	dh $@ --with ocaml
+	dh $@
 
 override_dh_auto_build:
 	$(MAKE) byte
@@ -12,3 +13,7 @@ override_dh_auto_build:
 override_dh_auto_install:
 	mkdir -p $(DOCDIR)
 	cp Changes $(DOCDIR)/changelog
+
+override_dh_gencontrol:
+	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
+

-- 
cmigrep packaging