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

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 4b8d1c5b2fbac87e1023019129606a7dae6f3438
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Thu Feb 19 18:01:49 2009 +0100

    Use predefined variables from ocamlvars.mk and coqvars.mk.

diff --git a/debian/changelog b/debian/changelog
index f979967..d677578 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 why (2.18.dfsg-1) UNRELEASED; urgency=low
 
+  [ Mehdi Dogguy ]
   * New upstream release.
   * Add a binary package libjessie-ocaml-dev
     + Add jessie_lib.dpatch patch for Jessie library:
@@ -21,7 +22,10 @@ why (2.18.dfsg-1) UNRELEASED; urgency=low
   * Remove not needed build dependency: ocamlweb
   * Using debhelper 7
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Mon, 02 Feb 2009 18:14:19 +0100
+  [ Samuel Mimram ]
+  * Use predefined variables from ocamlvars.mk and coqvars.mk.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 19 Feb 2009 18:00:33 +0100
 
 why (2.13-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ad3d16d..6c78674 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Build-Depends: debhelper (>= 7), autotools-dev, ocaml-nox (>= 3.10), ocaml-best-compilers, camlp4, liblablgtk2-ocaml-dev, coq (>= 8.1.pl2+dfsg-3), libfloat-coq (>= 1:8.1-1.0-4), libocamlgraph-ocaml-dev, dpatch
+Build-Depends: debhelper (>= 7), autotools-dev, dh-ocaml (>= 0.2), ocaml-nox (>= 3.10), ocaml-best-compilers, camlp4, liblablgtk2-ocaml-dev, coq (>= 8.2), libfloat-coq (>= 1:8.1-1.0-4), libocamlgraph-ocaml-dev, dpatch
 Standards-Version: 3.8.0
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/why.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/why.git
diff --git a/debian/libjessie-ocaml-dev.install.in b/debian/libjessie-ocaml-dev.install.in
index de7b6b7..028ce63 100644
--- a/debian/libjessie-ocaml-dev.install.in
+++ b/debian/libjessie-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-jc/jc.cm*a usr/lib/ocaml/@OCamlABI@/jessie/
-jc/jc.cmi usr/lib/ocaml/@OCamlABI@/jessie/
- at OPT@jc/jc.a usr/lib/ocaml/@OCamlABI@/jessie/
-debian/META usr/lib/ocaml/@OCamlABI@/jessie/
+jc/jc.cm*a @OCamlStdlibDir@/jessie/
+jc/jc.cmi @OCamlStdlibDir@/jessie/
+OPT: jc/jc.a @OCamlStdlibDir@/jessie/
+debian/META @OCamlStdlibDir@/jessie/
diff --git a/debian/rules b/debian/rules
index 710a334..cde383e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,9 @@
 #export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/coq/coqvars.mk
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -17,15 +20,9 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 WHYDIR    = $(CURDIR)/debian/why
-OCAMLABI := $(shell ocamlc -version)
-OFILES   := $(patsubst %.in,%,$(wildcard debian/*.in))
 VERSION   = $(shell cat Version | grep ^VERSION | cut -d= -f 2)
-OCAMLINITSED := -e 's/@OCamlABI@/$(OCAMLABI)/g' -e 's/@VERSION@/$(VERSION)/g'
-ifeq ($(shell test -e /usr/bin/ocamlopt && echo yes),yes)
-	OCAMLINITSED += -e 's/^@OPT@//'
-else
-	OCAMLINITSED += -e '/^@OPT@/d'
-endif
+
+OCAMLINIT_SED += -e 's/@VERSION@/$(VERSION)/g'
 
 CFLAGS = -Wall -g
 
@@ -35,11 +32,6 @@ else
 	CFLAGS += -O2
 endif
 
-ocamlinit:
-	for f in $(OFILES); do                      \
-		sed $(OCAMLINITSED) $$f.in > $$f;   \
-	done
-
 config.status: configure
 	dh_testdir
 	./configure \
@@ -57,7 +49,7 @@ build-stamp: config.status
 	$(MAKE)
 	touch $@
 
-clean: unpatch
+clean: unpatch ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || sed -e 's/include .depend.*//g' Makefile > Makefile.debian
@@ -71,7 +63,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) prefix=$(WHYDIR)/usr install COQLIB=$(WHYDIR)/usr/lib/coq
+	$(MAKE) prefix=$(WHYDIR)/usr install COQLIB=$(WHYDIR)/$(COQ_STDLIB_DIR)
 	mv $(WHYDIR)/usr/lib/why/why-logo-1.png $(WHYDIR)/usr/share/why
 
 # Build architecture-independent files here.
@@ -92,7 +84,7 @@ binary-arch: build install
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums
 	dh_builddeb
 

-- 
why packaging