[Pkg-ocaml-maint-commits] [SCM] ssreflect packaging branch, master, updated. debian/1.2+dfsg-2-5-g9b13712

Stephane Glondu steph at glondu.net
Sat Dec 19 16:40:47 UTC 2009


The following commit has been merged in the master branch:
commit 6db3c4ae0d74dbac81f1a8fb6439f204938cd67d
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Dec 19 16:47:57 2009 +0100

    Switch to dh-ocaml 0.9

diff --git a/debian/control b/debian/control
index 928a6b8..55d8b18 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~),
+ coq (>= 8.2.pl1+dfsg-4~),
  quilt (>= 0.46-7),
- coq (>= 8.2.pl1),
  libcoq-ocaml-dev,
- dh-ocaml,
- camlp5,
+ dh-ocaml (>= 0.9~),
+ camlp5 (>= 5.12-2~),
  ocaml-best-compilers,
- ocaml-nox (>= 3.11.1)
+ ocaml-nox (>= 3.11.1-3~)
 Standards-Version: 3.8.3
 Section: math
 Homepage: http://www.msr-inria.inria.fr/Projects/math-components
@@ -20,9 +20,10 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ssreflect.git
 Package: libssreflect-ocaml
 Architecture: any
 Depends:
- ocaml-base-nox-${F:OCamlABI},
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: small scale reflection extension for Coq (plugin)
  This package is part of Ssreflect, the small scale reflection
  extension for Coq. It provides a new tactic language, which promotes
diff --git a/debian/rules b/debian/rules
index cbf570c..9d22bec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 
 include /usr/share/coq/coqvars.mk
-include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/ocaml/ocamlvars.mk
 
 export COQTOP := $(COQ_STDLIB_DIR)
 export COQLIB := $(COQ_STDLIB_DIR)
 export COQBIN := /usr/bin/
 
 %:
-	+dh --with quilt $@
+	+dh --with ocaml $@
 
 .PHONY: override_dh_auto_configure
-override_dh_auto_configure: ocamlinit-stamp
+override_dh_auto_configure:
 	coq_makefile -f Make -o Makefile -R src Ssreflect -R theories Ssreflect
 
 .PHONY: override_dh_auto_build
@@ -23,10 +23,10 @@ override_dh_auto_build:
 override_dh_auto_install:
 
 .PHONY: override_dh_clean
-override_dh_clean: ocamlinit-clean
+override_dh_clean:
 	dh_clean
 	rm -Rf Makefile html
 
 .PHONY: override_dh_gencontrol
 override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)" -VF:CoqABI="$(COQ_ABI)"
+	dh_gencontrol -- -VF:CoqABI="$(COQ_ABI)"

-- 
ssreflect packaging



More information about the Pkg-ocaml-maint-commits mailing list