[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.13-1-72-g237d1e6

Mehdi Dogguy dogguy at pps.jussieu.fr
Fri Feb 27 13:11:19 UTC 2009


The following commit has been merged in the master branch:
commit 9baee62eac656ecb8045eb039d53704798b4f111
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri Feb 27 14:08:46 2009 +0100

    Use dh-ocaml predefined variables and add missing dependency for gwhy

diff --git a/debian/control b/debian/control
index 9b930a9..fe82280 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/why.git
 Package: why
 Architecture: any
 Depends:
+  ${F:WhyRuntime},
   ${shlibs:Depends},
   ${misc:Depends}
 Suggests: libwhy-coq
diff --git a/debian/rules b/debian/rules
index 01aaa92..86f482e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,9 +57,11 @@ install: build
 	#Used to remove jessie_why.v which is alone in /usr/lib/coq/
 	-rm -rf $(WHYDIR)/usr/lib/coq/
 	mv $(WHYDIR)/usr/lib/why/why-logo-1.png $(WHYDIR)/usr/share/why
-	echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/libjessie-ocaml-dev.substvars
-	echo 'F:CoqABI=$(COQ_ABI)' >> debian/why.substvars
+	echo 'F:OCamlRuntime=$(OCAML_RUNTIME_NOX)' >> debian/libjessie-ocaml-dev.substvars
 	echo 'F:CoqABI=$(COQ_ABI)' >> debian/libwhy-coq.substvars
+ifndef $(OCAML_OPT_ARCH)
+	echo 'F:WhyRuntime=liblablgtk2-ocaml,$(OCAML_RUNTIME_NOX)' >> debian/why.substvars
+endif
 
 # Build architecture-independent files here.
 binary-indep: build install

-- 
why packaging



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