[Pkg-ocaml-maint-commits] [SCM] facile packaging branch, master, updated. debian/1.1-6.3-15-gdbee476

Mehdi Dogguy mehdi at debian.org
Tue Oct 6 11:44:03 UTC 2009


The following commit has been merged in the master branch:
commit b0aa7138d683749f09c166b033a97ff590c09713
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 11:47:34 2009 +0200

    Use new features of dh-ocaml 0.9

diff --git a/debian/changelog b/debian/changelog
index d8fa942..a07bf23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ facile (1.1-7) UNRELEASED; urgency=low
   [ Mehdi Dogguy ]
   * Add myself to uploaders
   * Build-depend on ocaml (>= 3.11.1-3~) and dh-ocaml (>= 0.9~)
+  * Use new features of dh-ocaml 0.9
 
  -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 11:38:42 +0200
 
diff --git a/debian/control b/debian/control
index 9ed8459..afbfc5c 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/facile.git
 Package: libfacile-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides:
+ ${ocaml:Provides}
 Description: functional constraint library implemented in Objective Caml
  FaCiLe is a constraint programming library over integer finite domain
  written in Objective Caml. It offers all usual facilities to create
diff --git a/debian/rules b/debian/rules
index 75c82a8..446f59f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
-OCAMLABI := $(shell ocamlc -version)
 FACILEDIR := $(shell ocamlc -where)/facile
 DEB_INSTALL_DIRS_ALL += $(FACILEDIR)
-DEB_DH_GENCONTROL_ARGS += -u-VF:OCamlABI="$(OCAMLABI)"
 DEB_MAKE_INVOKE += OCAMLC="ocamlc -g" OCAMLMLI=ocamlc
 DEB_MAKE_INSTALL_TARGET := install
 DEB_MAKE_CHECK_TARGET := check

-- 
facile packaging



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