[Pkg-ocaml-maint-commits] [SCM] react packaging branch, master, updated. debian/0.9.0-1-3-g417ffca

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4590494dd553877e046fd233d85192668a7a5822
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Oct 5 10:11:13 2009 +0200

    Switch to dh-ocaml 0.9, various updates

diff --git a/debian/control b/debian/control
index 202169f..a351c69 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,12 @@
 Source: react
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stephane Glondu <steph at glondu.net>
-DM-Upload-Allowed: yes
+Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>= 7.0.52),
- dh-ocaml,
- ocaml-nox
-Standards-Version: 3.8.1
+ debhelper (>= 7.0.50~),
+ dh-ocaml (>= 0.9),
+ ocaml-nox (>= 3.11.1-3~)
+Standards-Version: 3.8.3
 Section: ocaml
 Homepage: http://erratique.ch/software/react
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/react.git
@@ -16,10 +15,10 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/react.git
 Package: libreact-ocaml-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
- libreact-ocaml,
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: functional reactive programming in OCaml
  React is an OCaml module for functional reactive programming.
@@ -32,9 +31,10 @@ Description: functional reactive programming in OCaml
 Package: libreact-ocaml
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: functional reactive programming in OCaml (plugins)
  React is an OCaml module for functional reactive programming.
diff --git a/debian/rules b/debian/rules
index 65b40a4..5d55f37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,13 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/ocaml/ocamlvars.mk
 
 OCAMLBUILD := ocamlbuild -classic-display $(if $(OCAML_OPT_ARCH),,-byte-plugin)
 
 TARGETS := react.cmo $(if $(OCAML_OPT_ARCH),react.cmx test.native,test.byte)
 
 %:
-	dh $@
-
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure: ocamlinit-stamp $(QUILT_STAMPFN)
+	dh --with ocaml $@
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
@@ -23,13 +20,9 @@ else
 endif
 
 .PHONY: override_dh_auto_clean
-override_dh_auto_clean: ocamlinit-clean
+override_dh_auto_clean:
 	$(OCAMLBUILD) -clean
 
-.PHONY: override_dh_gencontrol
-override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
-
 .PHONY: override_dh_compress
 override_dh_compress:
 	dh_compress -X.ml

-- 
react packaging