[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.19+dfsg-2-17-g9832da6
The following commit has been merged in the master branch: commit 246cd0343d3d8fd7daae2c493bbaf12f7065fe70 Author: Mehdi Dogguy me...@debian.org Date: Fri Nov 13 14:10:05 2009 +0100 Fix detection of Alt-Ergo (Closes: #552776). diff --git a/debian/changelog b/debian/changelog index 9f07472..7d0d9d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +why (2.19+dfsg-3) unstable; urgency=low + + * Fix detection of Alt-Ergo (Closes: #552776). + + -- Mehdi Dogguy me...@debian.org Fri, 13 Nov 2009 14:09:08 +0100 + why (2.19+dfsg-2) unstable; urgency=low * Install why library in usr/share since there is no arch dependent diff --git a/debian/patches/00list b/debian/patches/00list index 9e34026..e9c6887 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,4 @@ jessie_lib logopath makefile.in +altergo diff --git a/debian/patches/altergo.dpatch b/debian/patches/altergo.dpatch new file mode 100755 index 000..678d326 --- /dev/null +++ b/debian/patches/altergo.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## altergo.dpatch by Mehdi Dogguy me...@debian.org +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad why~/tools/dpConfig.ml why/tools/dpConfig.ml +--- why~/tools/dpConfig.ml 2009-11-13 14:08:03.0 +0100 why/tools/dpConfig.ml 2009-11-13 14:08:39.0 +0100 +@@ -71,7 +71,7 @@ + is_interactive = false; + version = ; + version_switch = -version; +-version_regexp = Ergo \\([^ ]*\\); ++version_regexp = Alt-Ergo \\([^ ]*\\); + command = alt-ergo; + command_switches = ; + valid_regexp = make_regexp \\bValid\\b; -- 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
[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.19+dfsg-2-17-g9832da6
The following commit has been merged in the master branch: commit 7a871991855763bf2b60a51f8fef46c94822f59f Author: Mehdi Dogguy me...@debian.org Date: Sun Jan 10 18:20:42 2010 +0100 Set filter-pristine-tar to True in debian/gbp.conf diff --git a/debian/changelog b/debian/changelog index 7d0d9d1..040bde7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ why (2.19+dfsg-3) unstable; urgency=low * Fix detection of Alt-Ergo (Closes: #552776). + * Set filter-pristine-tar to True in debian/gbp.conf - -- Mehdi Dogguy me...@debian.org Fri, 13 Nov 2009 14:09:08 +0100 + -- Mehdi Dogguy me...@debian.org Sun, 10 Jan 2010 18:20:23 +0100 why (2.19+dfsg-2) unstable; urgency=low diff --git a/debian/gbp.conf b/debian/gbp.conf index 077c00a..3667ca5 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,6 @@ [DEFAULT] pristine-tar = True +filter-pristine-tar = True filter = [ doc/manual.ps ] -- 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
[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.19+dfsg-2-17-g9832da6
The following commit has been merged in the master branch:
commit 30edb457360fddfdfadd66eff7a59d1757e217a8
Author: Mehdi Dogguy me...@debian.org
Date: Sun Jan 10 19:01:26 2010 +0100
Various changes
diff --git a/debian/changelog b/debian/changelog
index f0c059e..9bd5e5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
why (2.23+dfsg-1) UNRELEASED; urgency=low
* New upstream release
++ Remove makefile.in.dpatch (fixed upstream)
++ Remove jessie_lib.dpatch (not needed anymore)
++ Needs ocamlgraph 1.3
* Fix detection of Alt-Ergo (Closes: #552776).
* Set filter-pristine-tar to True in debian/gbp.conf
+ * Remove libjessie-ocaml-dev which is no longer user by Frama-C
* Update copyright file
-- Mehdi Dogguy me...@debian.org Sun, 10 Jan 2010 18:20:23 +0100
diff --git a/debian/clean b/debian/clean
index cf48e91..b2e7907 100644
--- a/debian/clean
+++ b/debian/clean
@@ -24,5 +24,3 @@ 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 63b0817..163a08a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends:
liblablgtk2-ocaml-dev (= 2.12.0-3),
coq (= 8.2.pl1),
libfloat-coq (= 1:8.2-1.2-3),
- libocamlgraph-ocaml-dev (= 1.1),
+ libocamlgraph-ocaml-dev (= 1.3),
+ frama-c-nox,
dpatch
Standards-Version: 3.8.2
Homepage: http://why.lri.fr/
@@ -54,17 +55,6 @@ Description: Examples of programs certified with Why
.
This package contains examples of programs verified using Why.
-Package: libjessie-ocaml-dev
-Architecture: any
-Depends:
- ocaml-nox-${F:OCamlABI},
- ${misc:Depends}
-Section: ocaml
-Description: Jessie library for C code analysis
- Jessie library, from Why certification tool, is useful for deductive
- verification. It is based on weakest precondition computation techniques
- and allows to prove that C functions satisfy their specification.
-
Package: libwhy-coq
Architecture: all
Depends:
diff --git a/debian/libjessie-ocaml-dev.NEWS b/debian/libjessie-ocaml-dev.NEWS
deleted file mode 100644
index 6f25ba9..000
--- a/debian/libjessie-ocaml-dev.NEWS
+++ /dev/null
@@ -1,8 +0,0 @@
-libjessie-ocaml-dev (2.18.dfsg-4) unstable; urgency=low
-
- This package was created to allow frama-c to link against Why.
- By default, frama-c use jc.cm{o,x} when linking. Thus, support for
- jc.cm{x,}a is dropped. These files are replaced by jc.cm{o,x}.
- META file is updated accordingly.
-
- -- Mehdi Dogguy dog...@pps.jussieu.fr Wed, 20 May 2009 15:42:47 +0200
diff --git a/debian/libjessie-ocaml-dev.install.in
b/debian/libjessie-ocaml-dev.install.in
deleted file mode 100644
index e488b74..000
--- a/debian/libjessie-ocaml-dev.install.in
+++ /dev/null
@@ -1,5 +0,0 @@
-jc/jc.cmo @OCamlStdlibDir@/jessie/
-jc/jc.cmi @OCamlStdlibDir@/jessie/
-OPT: jc/jc.o @OCamlStdlibDir@/jessie/
-OPT: jc/jc.cmx @OCamlStdlibDir@/jessie/
-debian/META @OCamlStdlibDir@/jessie/
diff --git a/debian/patches/00list b/debian/patches/00list
index e9c6887..3036b44 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,2 @@
-jessie_lib
logopath
-makefile.in
altergo
diff --git a/debian/patches/jessie_lib.dpatch b/debian/patches/jessie_lib.dpatch
deleted file mode 100755
index 6086879..000
--- a/debian/patches/jessie_lib.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## jessie_lib.dpatch by dog...@pps.jussieu.fr
-##
-## DP: Make jc_ast.ml and jc_env.ml fit correctly in the pack
-
-...@dpatch@
-diff -urNad why~/Makefile.in why/Makefile.in
why~/Makefile.in 2009-08-27 20:11:39.0 +0200
-+++ why/Makefile.in2009-08-27 20:35:12.0 +0200
-@@ -276,15 +276,15 @@
-
- # jessie
- JCCML_EXPORT = src/lib.ml src/rc.ml src/loc.ml src/pp.ml src/option_misc.ml \
-- jc/jc_type_var.ml jc/output.ml \
-+ jc/jc_type_var.ml jc/jc_env.ml jc/output.ml \
- jc/jc_common_options.ml jc/jc_stdlib.ml \
-- jc/jc_envset.ml jc/jc_region.ml jc/jc_fenv.ml \
-+ jc/jc_envset.ml jc/jc_region.ml jc/jc_ast.ml jc/jc_fenv.ml \
- jc/jc_constructors.ml \
- jc/jc_pervasives.ml jc/jc_iterators.ml \
- jc/jc_output_misc.ml jc/jc_poutput.ml jc/jc_output.ml jc/jc_noutput.ml
- JCCMO_EXPORT = $(JCCML_EXPORT:.ml=.cmo)
- JCCMX_EXPORT = $(JCCML_EXPORT:.ml=.cmx)
--JCCMI_EXPORT = jc/jc_ast.cmi jc/jc_env.cmi $(JCCML_EXPORT:.ml=.cmi)
-+JCCMI_EXPORT = $(JCCML_EXPORT:.ml=.cmi)
-
- JCCMO = src/version.cmo \
- @ATPCMO@ $(JCCMO_EXPORT) \
diff --git a/debian/patches/makefile.in.dpatch
b/debian/patches/makefile.in.dpatch
deleted file mode 100755
index 097a1d9..000
--- a/debian/patches/makefile.in.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile.in.dpatch by dog...@pps.jussieu.fr
-##
-## DP: directory examples-v7 does not exist.
-
-...@dpatch@
-diff -urNad why~/Makefile.in why/Makefile.in
[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.19+dfsg-2-17-g9832da6
The following commit has been merged in the master branch: commit afce099031db918dcc1918381c205de0ffc2f25d Author: Mehdi Dogguy me...@debian.org Date: Sun Jan 10 19:53:53 2010 +0100 Disable logopath patch diff --git a/debian/changelog b/debian/changelog index 9bd5e5e..89a0fc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ why (2.23+dfsg-1) UNRELEASED; urgency=low + Remove makefile.in.dpatch (fixed upstream) + Remove jessie_lib.dpatch (not needed anymore) + Needs ocamlgraph 1.3 - * Fix detection of Alt-Ergo (Closes: #552776). ++ Fixes detection of Alt-Ergo (Closes: #552776). * Set filter-pristine-tar to True in debian/gbp.conf * Remove libjessie-ocaml-dev which is no longer user by Frama-C * Update copyright file diff --git a/debian/patches/00list b/debian/patches/00list index 3036b44..e69de29 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +0,0 @@ -logopath -altergo diff --git a/debian/patches/altergo.dpatch b/debian/patches/altergo.dpatch deleted file mode 100755 index 678d326..000 --- a/debian/patches/altergo.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## altergo.dpatch by Mehdi Dogguy me...@debian.org -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@dpatch@ -diff -urNad why~/tools/dpConfig.ml why/tools/dpConfig.ml why~/tools/dpConfig.ml 2009-11-13 14:08:03.0 +0100 -+++ why/tools/dpConfig.ml 2009-11-13 14:08:39.0 +0100 -@@ -71,7 +71,7 @@ - is_interactive = false; - version = ; - version_switch = -version; --version_regexp = Ergo \\([^ ]*\\); -+version_regexp = Alt-Ergo \\([^ ]*\\); - command = alt-ergo; - command_switches = ; - valid_regexp = make_regexp \\bValid\\b; -- 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
[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.19+dfsg-2-17-g9832da6
The following commit has been merged in the master branch: commit d813515f6c4d777aceb39d82b1fac42ca25d7af9 Author: Mehdi Dogguy me...@debian.org Date: Sun Jan 10 22:46:39 2010 +0100 It's callded frama-c-base, for now diff --git a/debian/control b/debian/control index 693e31c..246812b 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: coq (= 8.2.pl1), libfloat-coq (= 1:8.2-1.2-3), libocamlgraph-ocaml-dev (= 1.3), - frama-c-nox, + frama-c-base, quilt (= 0.46-7~) Standards-Version: 3.8.2 Homepage: http://why.lri.fr/ -- 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
