[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.25+dfsg-1-8-ge70943f
Mehdi Dogguy
mehdi at debian.org
Tue Jun 1 20:09:57 UTC 2010
The following commit has been merged in the master branch:
commit f895ef4bdca7c87b87bc8f83b41d313621a1c122
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Mon May 24 23:30:51 2010 +0200
Refresh patches
diff --git a/debian/changelog b/debian/changelog
index 33defcc..1a99dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
why (2.26+dfsg-1) unstable; urgency=low
* New upstream release
+ - Refresh patches
* Update copyright years
-- Mehdi Dogguy <mehdi at debian.org> Sat, 15 May 2010 15:28:29 +0200
diff --git a/debian/patches/0001-Do-not-run-tests-on-non-existant-files.patch b/debian/patches/0001-Do-not-run-tests-on-non-existant-files.patch
index c83b6f9..77ceb43 100644
--- a/debian/patches/0001-Do-not-run-tests-on-non-existant-files.patch
+++ b/debian/patches/0001-Do-not-run-tests-on-non-existant-files.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Do not run tests on non-existant files
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 15b604b..1ff1a91 100644
+index c058478..587e8cd 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -731,7 +731,7 @@ bench-tc:: $(BINARY) $(WHYVO)
+@@ -735,7 +735,7 @@ bench-tc:: $(BINARY) $(WHYVO)
cd bench; sh ./bench "../$(BINARY) -tc"
test:: $(BINARY) $(WHYVO)
diff --git a/debian/patches/0002-Enable-Apron-support.patch b/debian/patches/0002-Enable-Apron-support.patch
index 898272d..88deac6 100644
--- a/debian/patches/0002-Enable-Apron-support.patch
+++ b/debian/patches/0002-Enable-Apron-support.patch
@@ -1,6 +1,5 @@
-From fa76edb5e371fd81d8a28ecbcec4d12e86b8261f Mon Sep 17 00:00:00 2001
From: Mehdi Dogguy <mehdi at debian.org>
-Date: Tue, 27 Apr 2010 12:22:38 +0200
+Date: Mon, 24 May 2010 23:28:57 +0200
Subject: [PATCH] Enable Apron support
---
@@ -8,28 +7,28 @@ Subject: [PATCH] Enable Apron support
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.in b/configure.in
-index d5162f7..27b3e89 100644
+index d931e5b..2d3872a 100644
--- a/configure.in
+++ b/configure.in
-@@ -264,7 +264,7 @@ APRONLIBS=
+@@ -261,7 +261,7 @@ APRONLIBS=
AC_ARG_ENABLE(apron,[ --enable-apron=[no/yes] use APRON library for abstract interpretation [default=yes]],,enable_apron=$default_apron)
if test "$enable_apron" = "yes" ; then
- AC_CHECK_FILE(/usr/local/lib/apron.cmxa,APRONLIB="-I /usr/local/lib -I /usr/lib",APRONLIB=no)
+ AC_CHECK_FILE($OCAMLLIB/apron/apron.cmxa,APRONLIB="-I +apron",APRONLIB=no)
- if test "$APRONLIB" = no ; then
+ if test "$APRONLIB" = no ; then
AC_CHECK_FILE(/usr/lib/apron.cmxa,APRONLIB="-I /usr/lib -I /usr/local/lib",APRONLIB=no)
- if test "$APRONLIB" = no ; then
-@@ -275,7 +275,7 @@ if test "$enable_apron" = "yes" ; then
+ if test "$APRONLIB" = no ; then
+@@ -272,7 +272,7 @@ if test "$enable_apron" = "yes" ; then
fi
if test "$enable_apron" = "yes" ; then
- 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
- else
+ else
APRONLIB=""
-@@ -544,4 +544,4 @@ if test "$PVS" = "yes" ; then
+@@ -541,4 +541,4 @@ if test "$PVS" = "yes" ; then
echo " Lib : $PVSLIB"
fi
echo "Mizar support : $MIZAR"
@@ -37,5 +36,3 @@ index d5162f7..27b3e89 100644
\ No newline at end of file
+echo "Other provers support : at run-time (use why-config to configure)"
--
-1.7.0
-
diff --git a/debian/patches/0003-Fix-spelling-errors.patch b/debian/patches/0003-Fix-spelling-errors.patch
index fc0dd46..f85054d 100644
--- a/debian/patches/0003-Fix-spelling-errors.patch
+++ b/debian/patches/0003-Fix-spelling-errors.patch
@@ -1,19 +1,18 @@
From: Mehdi Dogguy <mehdi at debian.org>
-Date: Sun, 24 Jan 2010 18:57:41 +0100
+Date: Tue, 1 Jun 2010 21:40:22 +0200
Subject: [PATCH] Fix spelling errors
---
c/ctyping.ml | 2 +-
jc/jc_typing.ml | 2 +-
ml/typing/parmatch.ml | 2 +-
- tools/dp.ml | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/c/ctyping.ml b/c/ctyping.ml
-index 4bdcbe4..e47a347 100644
+index b921295..94ba6bb 100644
--- a/c/ctyping.ml
+++ b/c/ctyping.ml
-@@ -349,7 +349,7 @@ let warn_for_read_only loc e =
+@@ -353,7 +353,7 @@ let warn_for_read_only loc e =
| TEvar (Fun_info _f) ->
warning loc ("function assignment (ignored)")
| _ when e.texpr_type.ctype_const ->
@@ -23,15 +22,15 @@ index 4bdcbe4..e47a347 100644
()
diff --git a/jc/jc_typing.ml b/jc/jc_typing.ml
-index c217377..4fae30d 100644
+index 80d9e3a..7567fa6 100644
--- a/jc/jc_typing.ml
+++ b/jc/jc_typing.ml
-@@ -3278,7 +3278,7 @@ of an invariant policy";
- | "cni", [_;_] -> `Cni
-
- | ("inc"|"cni"), _ -> typing_error loc "A Gen_separation inc or cni pragma should have 2 arguments (%i given)" (List.length li)
-- | _ -> typing_error loc "I dont know that kind of Gen_separation pragma : %s" kind in
-+ | _ -> typing_error loc "I don't know that kind of Gen_separation pragma : %s" kind in
+@@ -3295,7 +3295,7 @@ of an invariant policy";
+ "A Gen_separation inc or cni pragma should \
+ have 2 arguments (%i given)" (List.length li)
+ | _ -> typing_error loc
+- "I dont know that kind of Gen_separation pragma : %s" kind in
++ "I don't know that kind of Gen_separation pragma : %s" kind in
create_pragma_gen_sep_logic loc kind id li
end;
acc
diff --git a/debian/patches/0005-Generate-Jessie.cma-for-bytecode-only-architectures.patch b/debian/patches/0004-Generate-Jessie.cma-for-bytecode-only-architectures.patch
similarity index 89%
rename from debian/patches/0005-Generate-Jessie.cma-for-bytecode-only-architectures.patch
rename to debian/patches/0004-Generate-Jessie.cma-for-bytecode-only-architectures.patch
index 6f47cc2..4d2a654 100644
--- a/debian/patches/0005-Generate-Jessie.cma-for-bytecode-only-architectures.patch
+++ b/debian/patches/0004-Generate-Jessie.cma-for-bytecode-only-architectures.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Generate Jessie.cma for bytecode only architectures
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 5b749ac..1270548 100644
+index 587e8cd..0c119dc 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -365,7 +365,7 @@ ifeq ($(FRAMAC),yes)
+@@ -369,7 +369,7 @@ ifeq ($(FRAMAC),yes)
JESSIE_PLUGIN_PATH=frama-c-plugin
$(JESSIE_PLUGIN_BYTE): jc/jc.cmo $(JCCMO) $(CMO)
$(MAKE) -C $(JESSIE_PLUGIN_PATH) depend
diff --git a/debian/patches/0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch b/debian/patches/0005-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
similarity index 81%
rename from debian/patches/0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
rename to debian/patches/0005-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
index 3ae6d70..ec5a873 100644
--- a/debian/patches/0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
+++ b/debian/patches/0005-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
@@ -7,16 +7,16 @@ Subject: [PATCH] Coq-float can be in coqlib/user-contrib/Float
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
-index 7d0b77b..e7f0cd8 100644
+index 2d3872a..e8a8f59 100644
--- a/configure.in
+++ b/configure.in
-@@ -375,5 +375,5 @@ else
+@@ -372,7 +372,7 @@ else
AC_MSG_CHECKING(Coq floating-point library)
case $COQVERSION in
8.2*|trunk)
- if test -f "$COQLIB/user-contrib/AllFloat.vo"; then
+ if test -f "$COQLIB/user-contrib/AllFloat.vo" || test -f "$COQLIB/user-contrib/Float/AllFloat.vo"; then
AC_MSG_RESULT(yes)
- WHYFLOATS="lib/coq/WhyFloats.vo lib/coq/JessieFloats.vo"
+ WHYFLOATS="lib/coq/WhyFloats.vo lib/coq/JessieFloats.vo lib/coq/floats_strict.vo"
COQFLOATSMSG=yes
--
diff --git a/debian/patches/series b/debian/patches/series
index 9f8208b..c6c1cef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
0001-Do-not-run-tests-on-non-existant-files.patch
0002-Enable-Apron-support.patch
0003-Fix-spelling-errors.patch
-0005-Generate-Jessie.cma-for-bytecode-only-architectures.patch
-0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
+0004-Generate-Jessie.cma-for-bytecode-only-architectures.patch
+0005-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
--
why packaging
More information about the Pkg-ocaml-maint-commits
mailing list