[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.23+dfsg-1-1-g8fd96f1

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 8fd96f1931a1c775449ca3ba0bb935c711c5d566
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Sun Jan 17 18:51:03 2010 +0100

    Enable apron support.

diff --git a/debian/changelog b/debian/changelog
index db0562a..a89f077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 why (2.23+dfsg-1) unstable; urgency=low
 
+  [ Mehdi Dogguy ]
   * New upstream release
     + Remove makefile.in.dpatch (fixed upstream)
     + Remove jessie_lib.dpatch (not needed anymore)
@@ -15,7 +16,11 @@ why (2.23+dfsg-1) unstable; urgency=low
   * Remove libjessie-ocaml-dev which is no longer user by Frama-C
   * Update copyright file
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sun, 10 Jan 2010 22:48:50 +0100
+  [ Samuel Mimram ]
+  * Enable apron support.
+  * Added apron patch in order to be able to build with apron support.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 17 Jan 2010 18:47:50 +0100
 
 why (2.19+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 668add3..4a554bb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: why
 Section: math
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders:
-  Samuel Mimram <smimram at debian.org>,
+Uploaders: Samuel Mimram <smimram at debian.org>,
   Mehdi Dogguy <mehdi at debian.org>
 Build-Depends:
   debhelper (>= 7.0.50~),
   autotools-dev,
+  autoconf,
   dh-ocaml (>= 0.4.1),
   ocaml-nox (>= 3.11.1),
   ocaml-best-compilers,
@@ -17,6 +17,7 @@ Build-Depends:
   libfloat-coq (>= 1:8.2-1.2-3),
   libocamlgraph-ocaml-dev (>= 1.3),
   frama-c-base,
+  libapron-ocaml-dev (>= 0.9.10-4),
   quilt (>= 0.46-7~)
 Standards-Version: 3.8.3
 Homepage: http://why.lri.fr/
diff --git a/debian/patches/apron b/debian/patches/apron
new file mode 100644
index 0000000..5b4115d
--- /dev/null
+++ b/debian/patches/apron
@@ -0,0 +1,19 @@
+Index: why/configure.in
+===================================================================
+--- why.orig/configure.in	2010-01-17 18:45:00.000000000 +0100
++++ why/configure.in	2010-01-17 18:46:14.000000000 +0100
+@@ -252,12 +252,12 @@
+ if test "$enable_apron" = "yes" ; then
+    AC_CHECK_FILE(/usr/local/lib/apron.cmxa,APRONLIB="-I /usr/local/lib -I /usr/lib",APRONLIB=no)
+    if test "$APRONLIB" = no ; then	
+-      AC_CHECK_FILE(/usr/lib/apron.cmxa,APRONLIB="-I /usr/lib -I /usr/local/lib",APRONLIB=no)
++      AC_CHECK_FILE(/usr/lib/ocaml/apron/apron.cmxa,APRONLIB="-I /usr/lib/ocaml/apron",APRONLIB=no)
+       if test "$APRONLIB" = no ; then	
+ 	 AC_MSG_ERROR(Cannot find APRON library.)
+       fi		     
+    fi
+-   APRONLIBS="-cclib ' -lpolka_caml -lpolkaMPQ -loct_caml -loctMPQ -lbox_caml -lboxMPQ -lapron_caml -lapron -lgmp_caml -lmpfr -lgmp -lbigarray -lcamlidl' bigarray.cmxa gmp.cmxa apron.cmxa box.cmxa polka.cmxa"
++   APRONLIBS="-cclib ' -lpolkaMPQ_caml -lpolkaMPQ -loctMPQ_caml -loctMPQ -lboxMPQ_caml -lboxMPQ -lapron_caml -lapron -lgmp_caml -lmpfr -lgmp -lbigarray -lcamlidl' bigarray.cmxa gmp.cmxa apron.cmxa box.cmxa polka.cmxa"
+    ATPCMO=atp/atp.cmo
+ fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c5bd921..3b8d4de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Do-not-run-tests-on-non-existant-files.patch
+apron
diff --git a/debian/rules b/debian/rules
index c838296..c555ead 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ VERSION   = $(shell cat Version | grep ^VERSION | cut -d= -f 2)
 export OCAMLINIT_SED += -e 's/@VERSION@/$(VERSION)/g'
 
 override_dh_auto_configure:
+	autoconf
 	./configure \
 	    --host=$(DEB_HOST_GNU_TYPE) \
 	    --build=$(DEB_BUILD_GNU_TYPE) \
@@ -19,6 +20,7 @@ override_dh_auto_configure:
 	    --libdir=/usr/share \
 	    --mandir=\$${prefix}/share/man \
 	    --infodir=\$${prefix}/share/info \
+	    --enable-apron=yes \
 	    LDFLAGS="-Wl,-z,defs"
 
 override_dh_auto_clean:

-- 
why packaging