The following commit has been merged in the master branch:
commit 1cb8947d4be605b2341efb2bfae123df03bed6f3
Author: Mehdi Dogguy <[EMAIL PROTECTED]>
Date: Sat Nov 15 21:28:16 2008 +0100
* Add a binary package libjessie-ocaml-dev
+ Add jessie_lib.dpatch patch for Jessie library:
- Build and install jc.{cma,cmxa,a}
- Install jc.cmi
+ Add a META file for Jessie library
* Remove not needed build dependency ocamlweb
* Using debhelper 7
diff --git a/debian/META.in b/debian/META.in
new file mode 100644
index 0000000..7def244
--- /dev/null
+++ b/debian/META.in
@@ -0,0 +1,6 @@
+name="jessie"
+version="@VERSION@"
+description="This is the jessie library from Why plateform"
+requires=""
+archive(byte)="jc.cma"
+archive(native)="jc.cmxa"
diff --git a/debian/changelog b/debian/changelog
index b99bca6..759ec64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,22 @@
why (2.16.dfsg-1) UNRELEASED; urgency=low
* New upstream release.
- * Add jessie_lib.dpatch patch for Jessie library:
- - Build and install jc.{cma,cmxa,a}
- - Install jc.cmi
- * Bump standards version to 3.8.0
+ * Add a binary package libjessie-ocaml-dev
+ + Add jessie_lib.dpatch patch for Jessie library:
+ - Build and install jc.{cma,cmxa,a}
+ - Install jc.cmi
+ + Add a META file for Jessie library
+ * Bump standards version to 3.8.0, no changes needed.
* Installing .vo files in /usr/lib/coq/user-contrib, closes: #498713.
- * Move logo in /usr/share/why (with logopath.dpatch)
+ * Move logo in /usr/share/why (using logopath.dpatch)
* Add patch descriptions to configure.dpatch and logopath.dpatch
* Setting up manpages for krakatoa, gwhy-bin, tool-stat and why-config
- * Change vcs browser address (for viewsvn)
* Switching packaging to git
+ + Change vcs-* fields
+ * Remove not needed build dependency ocamlweb
+ * Using debhelper 7
- -- Mehdi Dogguy <[EMAIL PROTECTED]> Tue, 04 Nov 2008 18:55:35 +0100
+ -- Mehdi Dogguy <[EMAIL PROTECTED]> Sat, 15 Nov 2008 21:25:27 +0100
why (2.13-2) unstable; urgency=low
diff --git a/debian/clean b/debian/clean
index b2e7907..cf48e91 100644
--- a/debian/clean
+++ b/debian/clean
@@ -24,3 +24,5 @@ mix/mix_parser.output
regtest.opt
tools/simplify_parser.output
tools/toolstat_pars.output
+debian/libjessie-ocaml-dev.install
+debian/META
diff --git a/debian/control b/debian/control
index bef07ae..f193219 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
Priority: optional
Maintainer: Debian OCaml Maintainers <[EMAIL PROTECTED]>
Uploaders: Samuel Mimram <[EMAIL PROTECTED]>, Mehdi Dogguy <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), 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), ocamlweb, libocamlgraph-ocaml-dev, dpatch
+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
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
@@ -19,3 +19,11 @@ Description: A software verification tool
exceptions. It generates proof obligations for many systems: the proof
assistants Coq, PVS, Isabelle/HOL, HOL 4, HOL Light, Mizar and the
decision procedures Simplify, Ergo, Yices, CVC Lite and haRVey.
+
+Package: libjessie-ocaml-dev
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}
+Section: libdevel
+Description: Jessie library for code analysis
+ Jessie library, from Why certification tool, is useful for C code
+ analysis. It also generates Why code.
diff --git a/debian/libjessie-ocaml-dev.install.in
b/debian/libjessie-ocaml-dev.install.in
new file mode 100644
index 0000000..2a32697
--- /dev/null
+++ b/debian/libjessie-ocaml-dev.install.in
@@ -0,0 +1,4 @@
+jc/jc.cm*a usr/lib/ocaml/@OCamlABI@/jessie/
+jc/jc.cmi usr/lib/ocaml/@OCamlABI@/jessie/
+jc/jc.a usr/lib/ocaml/@OCamlABI@/jessie/
+debian/META usr/lib/ocaml/@OCamlABI@/jessie/
diff --git a/debian/rules b/debian/rules
index b2162c2..b3f890c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,10 @@ include /usr/share/dpatch/dpatch.make
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)
CFLAGS = -Wall -g
@@ -25,6 +29,13 @@ else
CFLAGS += -O2
endif
+ocamlinit:
+ for f in $(OFILES); do \
+ sed -e 's/@OCamlABI@/$(OCAMLABI)/g' \
+ -e 's/@VERSION@/$(VERSION)/g' \
+ $$f.in > $$f; \
+ done
+
config.status: configure
dh_testdir
./configure \
@@ -36,7 +47,7 @@ config.status: configure
LDFLAGS="-Wl,-z,defs"
cp .depend .depend.debian
-build: patch-stamp build-stamp
+build: ocamlinit patch-stamp build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
@@ -56,8 +67,8 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) prefix=$(CURDIR)/debian/why/usr install
COQLIB=$(CURDIR)/debian/why/usr/lib/coq
- mv $(CURDIR)/debian/why/usr/lib/why/why-logo-1.png
$(CURDIR)/debian/why/usr/share/why
+ $(MAKE) prefix=$(WHYDIR)/usr install COQLIB=$(WHYDIR)/usr/lib/coq
+ mv $(WHYDIR)/usr/lib/why/why-logo-1.png $(WHYDIR)/usr/share/why
# Build architecture-independent files here.
binary-indep: build install
@@ -77,7 +88,7 @@ binary-arch: build install
dh_fixperms
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
dh_md5sums
dh_builddeb
--
why packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
