[Pkg-ocaml-maint-commits] [SCM] cairo-ocaml packaging branch, master, updated. debian/20090223-1-13-g46caeca

[Stephane Glondu]

The following commit has been merged in the master branch:
commit fadff87c283fe0d1f65d75fc30bf8372270ca8c1
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Nov 3 18:04:50 2009 +0100

    Switch to dh-ocaml 0.9

diff --git a/debian/control b/debian/control
index 1794613..725a140 100644
--- a/debian/control
+++ b/debian/control
@@ -9,18 +9,22 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  automake1.9,
  autoconf,
- ocaml-findlib (>= 1.2.4),
- dh-ocaml,
- ocaml-nox (>= 3.11),
+ ocaml-findlib (>= 1.2.5),
+ dh-ocaml (>= 0.9),
+ ocaml-nox (>= 3.11.1-3~),
  libcairo2-dev (>= 1.2),
- liblablgtk2-ocaml-dev (>= 2.12.0)
+ liblablgtk2-ocaml-dev (>= 2.12.0-4~)
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cairo-ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cairo-ocaml.git
 
 Package: libcairo-ocaml
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for Cairo
  Cairo is a multi-platform library providing anti-aliased
  vector-based rendering for multiple target backends. Paths consist
@@ -40,7 +44,12 @@ Description: OCaml bindings for Cairo
 
 Package: libcairo-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcairo2-dev, liblablgtk2-ocaml-dev, libcairo-ocaml (= ${binary:Version})
+Depends:
+ libcairo2-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Suggests: ocaml-findlib
 Description: OCaml bindings for Cairo
  Cairo is a multi-platform library providing anti-aliased
diff --git a/debian/dirs.in b/debian/dirs.in
deleted file mode 100644
index 9202272..0000000
--- a/debian/dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlStdlibDir@/cairo
diff --git a/debian/libcairo-ocaml-dev.install.in b/debian/libcairo-ocaml-dev.install.in
index f8d8b64..384ab46 100644
--- a/debian/libcairo-ocaml-dev.install.in
+++ b/debian/libcairo-ocaml-dev.install.in
@@ -1,3 +1,4 @@
+debian/META                    @OCamlStdlibDir@/cairo
 @OCamlStdlibDir@/cairo/*.a
 @OCamlStdlibDir@/cairo/*.cm*
 @OCamlStdlibDir@/cairo/*.ml*
diff --git a/debian/rules b/debian/rules
index 0e3ea24..37e0317 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
 #export DH_VERBOSE=1
 
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR = $(CURDIR)/debian/tmp
 
@@ -21,7 +20,7 @@ orig-tarball:
 	rm -rf cairo-ocaml-$(NOW)
 
 %:
-	dh $@
+	dh --with ocaml $@
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
@@ -48,9 +47,3 @@ override_dh_auto_clean:
 override_dh_auto_install:
 	mkdir -p $(DESTDIR)
 	$(MAKE) install DESTDIR=$(DESTDIR)
-	mkdir -p debian/libcairo-ocaml-dev/$(OCAML_STDLIB_DIR)/cairo/
-	cp debian/META debian/libcairo-ocaml-dev/$(OCAML_STDLIB_DIR)/cairo/
-
-.PHONY: override_dh_gencontrol
-override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"

-- 
cairo-ocaml packaging