This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository dose3.

commit 55407bd7cc8250495b21223428cda7392292e214
Author: Ralf Treinen <trei...@free.fr>
Date:   Wed Jun 22 20:06:22 2016 +0200

    Imported Upstream version 5.0
---
 CHANGES                         |  1 +
 applications/dose-tests.list.in |  9 +++++++++
 common/edosSolver.ml            | 12 +-----------
 configure                       | 18 +++++++++---------
 configure.ac                    |  2 +-
 doc/manpages/distcheck.pod      |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/CHANGES b/CHANGES
index ab31f7e..1939b36 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,6 +35,7 @@ dose3 (4.3) UNRELEASED; urgency=low
  * Make ocamlgraph a hard dependency of dose.
  * Switch to ocamlgraph based explanation graphs by default
  * add {foregin,native}-architecture field to distcheck output
+ * add essential cudf property only if really needed. Assuming default 
otherwise.
  * bump output-version to 1.2
  * add --lowmem option to distcheck (slow, but consumes less memory)
  * remove build-essential field from buildcheck
diff --git a/applications/dose-tests.list.in b/applications/dose-tests.list.in
index 58c8ab5..79c7a1e 100644
--- a/applications/dose-tests.list.in
+++ b/applications/dose-tests.list.in
@@ -141,6 +141,15 @@ Printer: text
 ExitCode: 0
 Speed: slow
 
+Name: distcheck_opam
+Group: distcheck
+Expected: tests/applications/dose-tests/opam_stack_overflow
+Input: opam://tests/opam/stack_overflow.opam
+Cmd: ./distcheck.@OCAMLEXT@ -f -e
+Type: distcheck
+Printer: text
+ExitCode: 1
+
 Name: failure_distcheck
 Group: distcheck
 Expected: tests/applications/dose-tests/distcheck_test_failure
diff --git a/common/edosSolver.ml b/common/edosSolver.ml
index c699854..5fc3fac 100644
--- a/common/edosSolver.ml
+++ b/common/edosSolver.ml
@@ -57,7 +57,7 @@ module IntHash =
   end)
 
 open ExtLib
-(*
+
 let (@) l1 l2 =
   let rec geq = function
     |[],[] -> true
@@ -66,16 +66,6 @@ let (@) l1 l2 =
     |_::r1,_::r2 -> geq (r1,r2)
   in 
   if geq (l1,l2) then List.append l2 l1 else List.append l1 l2
-*)
-
-(* join two lists ignoring the order *)
-let (@) l1 l2 =
-  let rec aux l1 l2 acc =
-    match (l1,l2) with
-    |x::r1,y::r2 -> aux r1 r2 (x::y::acc)
-    |l1,[] -> List.fold_left (fun accu x -> x::accu) l1 acc
-    |[],l2 -> List.fold_left (fun accu x -> x::accu) l2 acc
-  in aux l1 l2 []
 
 module M (X : S) = struct
 
diff --git a/configure b/configure
index 692fdb3..62790bc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dose3 5.0~rc2.
+# Generated by GNU Autoconf 2.69 for dose3 5.0.
 #
 # Report bugs to <pietro.ab...@inria.fr>.
 #
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dose3'
 PACKAGE_TARNAME='dose3'
-PACKAGE_VERSION='5.0~rc2'
-PACKAGE_STRING='dose3 5.0~rc2'
+PACKAGE_VERSION='5.0'
+PACKAGE_STRING='dose3 5.0'
 PACKAGE_BUGREPORT='pietro.ab...@inria.fr'
 PACKAGE_URL=''
 
@@ -1317,7 +1317,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dose3 5.0~rc2 to adapt to many kinds of systems.
+\`configure' configures dose3 5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1379,7 +1379,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dose3 5.0~rc2:";;
+     short | recursive ) echo "Configuration of dose3 5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1475,7 +1475,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dose3 configure 5.0~rc2
+dose3 configure 5.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1733,7 +1733,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dose3 $as_me 5.0~rc2, which was
+It was created by dose3 $as_me 5.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5933,7 +5933,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dose3 $as_me 5.0~rc2, which was
+This file was extended by dose3 $as_me 5.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5986,7 +5986,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dose3 config.status 5.0~rc2
+dose3 config.status 5.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index c884911..694b2eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(dose3, 5.0~rc2, pietro.ab...@inria.fr)
+AC_INIT(dose3, 5.0, pietro.ab...@inria.fr)
 AC_COPYRIGHT(Copyright 2009-2016 Mancoosi Project)
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/manpages/distcheck.pod b/doc/manpages/distcheck.pod
index 38e2cfd..4361cf9 100644
--- a/doc/manpages/distcheck.pod
+++ b/doc/manpages/distcheck.pod
@@ -286,7 +286,7 @@ Add packages in I<file> to the background.
 =item B<--compare>
 
 When specified with a B<pef> file, select the comparison function used by the
-pef -> cudf enconding. Possible values are B<deb> 
+pef -> cudf encoding. Possible values are B<deb> 
 (<https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version>) 
, 
 B<semver> (<http://semver.org/>) , B<npm> 
(<https://docs.npmjs.com/misc/semver>)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to