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

josch pushed a commit to branch master
in repository dose3.

commit ef1d5fdb6f2372a07eaba69850af03f76ca2dff5
Author: Johannes Schauer <jo...@debian.org>
Date:   Thu Sep 8 22:43:02 2016 +0200

    New upstream version 5.0.1
---
 Makefile.config.in        |  4 +++
 algo/dominators.ml        |  2 +-
 applications/distcheck.ml |  2 +-
 configure                 | 18 ++++++-------
 configure.ac              |  2 +-
 deb/debcudf.ml            | 16 ++++++-----
 deb/tests.ml              | 69 ++++++++++++++++++++++++++++-------------------
 7 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index b993aa6..155a77a 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -34,6 +34,10 @@ UNINSTALL=$(OCAMLFIND) remove -destdir $(LIBDIR)
 
 printconf:
        @echo
+       @for i in "cudf re.pcre extlib ocamlgraph"; do \
+               m=`ocamlfind query -format "%p: %v" $$i`; \
+               echo "$$m\n"; \
+       done
        @echo "DESTDIR: $(DESTDIR)"
        @echo "OCAMLFIND_DESTDIR: $(OCAMLFIND_DESTDIR)"
        @echo "Prefix: @prefix@"
diff --git a/algo/dominators.ml b/algo/dominators.ml
index d7be032..230acd4 100644
--- a/algo/dominators.ml
+++ b/algo/dominators.ml
@@ -101,7 +101,7 @@ let dominators_tarjan graph =
   ) graph;
 
   Util.Timer.start tjntimer;
-#if OCAMLGRAPHVERSION <= 186
+#if OCAMLGRAPHVERSION >= 186
   let module Dom = Dominator.Make_graph(G) in
 #else
   let module Dom = Dominator.Make(G) in
diff --git a/applications/distcheck.ml b/applications/distcheck.ml
index 48c323f..cd5829b 100644
--- a/applications/distcheck.ml
+++ b/applications/distcheck.ml
@@ -133,7 +133,7 @@ let main () =
         fatal "Cannot find any package corresponding to the selector %s" 
         (Util.string_of_list ~sep:", " Pef.Printer.string_of_vpkg co)
       |l -> l
-    end else if bg_pkglist = [] then fg_pkglist else []
+    end else fg_pkglist
   in
 
   let coinstlist = 
diff --git a/configure b/configure
index 62790bc..49c02df 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.
+# Generated by GNU Autoconf 2.69 for dose3 5.0.1.
 #
 # 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'
-PACKAGE_STRING='dose3 5.0'
+PACKAGE_VERSION='5.0.1'
+PACKAGE_STRING='dose3 5.0.1'
 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 to adapt to many kinds of systems.
+\`configure' configures dose3 5.0.1 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:";;
+     short | recursive ) echo "Configuration of dose3 5.0.1:";;
    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
+dose3 configure 5.0.1
 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, which was
+It was created by dose3 $as_me 5.0.1, 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, which was
+This file was extended by dose3 $as_me 5.0.1, 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
+dose3 config.status 5.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 694b2eb..d73d724 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(dose3, 5.0, pietro.ab...@inria.fr)
+AC_INIT(dose3, 5.0.1, pietro.ab...@inria.fr)
 AC_COPYRIGHT(Copyright 2009-2016 Mancoosi Project)
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/deb/debcudf.ml b/deb/debcudf.ml
index fd4b980..8c83f0d 100644
--- a/deb/debcudf.ml
+++ b/deb/debcudf.ml
@@ -224,13 +224,15 @@ let get_cudf_version tables (package,version) =
 let get_real_name name = 
   (* Remove --virtual- and architecture encoding *)
   let dn = (CudfAdd.decode name) in
-  if ExtString.String.starts_with dn "--vir" then
-    (ExtString.String.slice ~first:10 dn,None)
-  else
-    try
-      let (n,a) = ExtString.String.split dn ":" in
-      if n = "src" then (a,None) else (n,Some a)
-    with Invalid_string -> (dn,None)
+  let no_virtual =
+    if ExtString.String.starts_with dn "--vir"
+    then ExtString.String.slice ~first:10 dn
+    else dn
+  in
+  try
+    let (n,a) = ExtString.String.split no_virtual ":" in
+    if n = "src" then (a,None) else (n,Some a)
+  with Invalid_string -> (no_virtual,None)
 
 let get_real_version tables (cudfname,cudfversion) =
   let (debname,arch) = get_real_name cudfname in
diff --git a/deb/tests.ml b/deb/tests.ml
index 96728fe..786690f 100644
--- a/deb/tests.ml
+++ b/deb/tests.ml
@@ -28,6 +28,36 @@ let f_release = Filename.concat test_dir 
"DebianPackages/Release" ;;
 let f_discriminants = Filename.concat test_dir "deb/discriminants" ;;
 let f_essential = Filename.concat test_dir "deb/essential" ;;
 
+(* Useful test functions *)
+
+let returns_result ?(printer=(fun _ -> "(FIXME)")) function_to_test 
expected_result =
+  (fun args () -> assert_equal ~printer (function_to_test args) 
expected_result)
+and raises_failure function_to_test failure_text =
+  (fun args () -> assert_raises (Failure failure_text) (fun () -> 
function_to_test args) )
+
+(* let ch = Input.open_file f_packages ;; *)
+(* Extension of "bracket_tmpfile" function, filling
+    the temporary file with lines from the given list. *)
+let bracket_tmpfile_filled lines (test_fun : string -> unit)  =
+  bracket_tmpfile
+    (fun (file, ch) ->
+      List.iter (fun line ->
+        output_string ch (line ^ "\n")
+      ) lines;
+      close_out ch;
+      test_fun file
+    )
+;;
+
+(* Makes a list of test cases from a list of triplets:
+    (test_name, string_to_parse, assert_function) *)
+let make_test_cases triplets =
+  List.map (fun (test_name, input, assert_function) ->
+    test_name >:: assert_function input
+  ) triplets
+
+
+
 (* XXX TODO:
   * add test for default arch
   * add test for extras
@@ -216,6 +246,16 @@ let test_version =
   ]
 ;;
 
+let test_realname =
+  let function_to_test = Debcudf.get_real_name in
+  let returns = returns_result function_to_test
+  in
+  [ ("none", "name", returns ("name",None) );
+    ("virtual simple", "--virtual-name", returns ("name",None) );
+    ("virtual arch", "--virtual-name:arch", returns ("name",Some "arch") );
+    ("virtual src", "--virtual-src:name", returns ("name",None) );
+  ] 
+
 let string_of_relop = function
   |`Eq -> "="
   |`Neq -> "!="
@@ -517,27 +557,6 @@ let test_mapping =
 
 (* Parsing tests *)
 
-(* Useful test functions *)
-
-let returns_result ?(printer=(fun _ -> "(FIXME)")) function_to_test 
expected_result =
-  (fun args () -> assert_equal ~printer (function_to_test args) 
expected_result)
-and raises_failure function_to_test failure_text =
-  (fun args () -> assert_raises (Failure failure_text) (fun () -> 
function_to_test args) )
-
-(* let ch = Input.open_file f_packages ;; *)
-(* Extension of "bracket_tmpfile" function, filling
-    the temporary file with lines from the given list. *)
-let bracket_tmpfile_filled lines (test_fun : string -> unit)  =
-  bracket_tmpfile
-    (fun (file, ch) ->
-      List.iter (fun line ->
-        output_string ch (line ^ "\n")
-      ) lines;
-      close_out ch;
-      test_fun file
-    )
-;;
-
 (* parse_inst *)
 
 (* List of triplets: (test_name, file_lines, expected_result) *)
@@ -700,13 +719,6 @@ let parse_pin_triplets =
     ("version 1", "version name1", returns (Apt.Pref.Version "name1"));
     ("origin 1",  "origin name1",  returns (Apt.Pref.Origin "name1")); ]
 
-(* Makes a list of test cases from a list of triplets:
-    (test_name, string_to_parse, assert_function) *)
-let make_test_cases triplets =
-  List.map (fun (test_name, input, assert_function) ->
-    test_name >:: assert_function input
-  ) triplets
-
 let test_parsing =
   "test_parsing" >::: [
     test_parse_inst;
@@ -1085,6 +1097,7 @@ let all =
     "test versioned provides" >::: make_test_cases test_versioned_provides;
     test_mapping ;
     test_conflicts;
+    "test real name" >::: make_test_cases test_realname;
     test_version;
     test_cluster;
     test_evolution;

-- 
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