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

treinen pushed a commit to branch experimental/master
in repository dose3.

commit 62d4dcdf9240954413481ab06b61ec38158c3903
Author: Ralf Treinen <trei...@free.fr>
Date:   Tue May 6 19:31:58 2014 +0200

    Imported Upstream version 3.2~rc3
---
 common/input.ml            |  35 +++++++++--
 configure                  |  18 +++---
 configure.ac               |   2 +-
 doc/manpages/coinstall.pod | 145 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 184 insertions(+), 16 deletions(-)

diff --git a/common/input.ml b/common/input.ml
index 6c19cbc..747a429 100644
--- a/common/input.ml
+++ b/common/input.ml
@@ -58,12 +58,35 @@ let close_ch ch = IO.close_in ch
 
 let open_file file =
   if (Unix.stat file).Unix.st_size = 0 then fatal "Input file %s is empty" 
file;
-  if Filename.check_suffix file ".gz" || Filename.check_suffix file ".cz" then
-    gzip_open_file file
-  else if Filename.check_suffix file ".bz2" then
-    bzip_open_file file
-  else 
-    std_open_file file
+  let openfun = try
+      let ch = open_in file in
+      let openfun = match input_byte ch with
+        (* gzip magic is 0x1f 0x8b *)
+        | 0x1f -> (match input_byte ch with
+            | 0x8b -> gzip_open_file
+            | _ -> std_open_file)
+        (* bz2 magic is "BZh" *)
+        | 0x42 -> (match input_byte ch with
+            | 0x5a -> (match input_byte ch with
+                | 0x68 -> bzip_open_file
+                | _ -> std_open_file)
+            | _ -> std_open_file)
+        (* xz magic is 0xfd "7zXZ" *)
+        | 0xfd -> (match input_byte ch with
+            | 0x37 -> (match input_byte ch with
+                | 0x7a -> (match input_byte ch with
+                    | 0x58 -> (match input_byte ch with
+                        | 0x5a -> fatal "xz not supported."
+                        | _ -> std_open_file)
+                    | _ -> std_open_file)
+                | _ -> std_open_file)
+            | _ -> std_open_file)
+        | _ -> std_open_file
+      in
+      close_in ch;
+      openfun
+    with End_of_file -> std_open_file in
+  openfun file
 ;;
 
 let parse_uri s =
diff --git a/configure b/configure
index 36e5014..2889ef6 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 3.2-rc2.
+# Generated by GNU Autoconf 2.69 for dose3 3.2-rc3.
 #
 # Report bugs to <pietro.ab...@pps.univ-paris-diderot.fr>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dose3'
 PACKAGE_TARNAME='dose3'
-PACKAGE_VERSION='3.2-rc2'
-PACKAGE_STRING='dose3 3.2-rc2'
+PACKAGE_VERSION='3.2-rc3'
+PACKAGE_STRING='dose3 3.2-rc3'
 PACKAGE_BUGREPORT='pietro.ab...@pps.univ-paris-diderot.fr'
 PACKAGE_URL=''
 
@@ -1307,7 +1307,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 3.2-rc2 to adapt to many kinds of systems.
+\`configure' configures dose3 3.2-rc3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1368,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dose3 3.2-rc2:";;
+     short | recursive ) echo "Configuration of dose3 3.2-rc3:";;
    esac
   cat <<\_ACEOF
 
@@ -1465,7 +1465,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dose3 configure 3.2-rc2
+dose3 configure 3.2-rc3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1721,7 +1721,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 3.2-rc2, which was
+It was created by dose3 $as_me 3.2-rc3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -6521,7 +6521,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 3.2-rc2, which was
+This file was extended by dose3 $as_me 3.2-rc3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6574,7 +6574,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 3.2-rc2
+dose3 config.status 3.2-rc3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index a98a3d4..8b68107 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(dose3, 3.2-rc2, pietro.ab...@pps.univ-paris-diderot.fr)
+AC_INIT(dose3, 3.2-rc3, pietro.ab...@pps.univ-paris-diderot.fr)
 
 AC_PROG_OCAML
 if test "$OCAMLC" = "no"; then
diff --git a/doc/manpages/coinstall.pod b/doc/manpages/coinstall.pod
new file mode 100644
index 0000000..60a3536
--- /dev/null
+++ b/doc/manpages/coinstall.pod
@@ -0,0 +1,145 @@
+=head1 NAME
+
+dose-debcoinstall - calculate a coinstallation set of a given set of Debian 
binary packages
+
+=head1 SYNOPSIS
+
+=over
+
+=item B<dose-debcoinstall> [options] I<binary-repositories>
+
+=back
+=cut
+
+=head1 DESCRIPTION
+
+dose-debcoinstall determines whether a set of foreground Debian binary packages
+can be installed together given a set of background Debian binary packages. If
+yes, then a valid coinstallation set is printed on standard output. If the
+B<--src> option is given, then the associated source packages are printed on
+standard output instead.
+
+Packages are split into foreground and background: only packages in the
+foreground are checked for coinstallability, but dependencies may be satisfied
+by foreground packages and by background packages. By default, all packages are
+in the foreground.
+
+=cut
+
+=head1 INPUT FORMAT
+
+The B<binary-repositories> argument is a list of filenames containing stanzas
+in the format of L<deb-control(5)>, separated by one blank line. For instance,
+the Packages files as found on a Debian mirror server, or in the directory
+I</var/lib/apt/lists/> of a Debian system, are suitable.
+
+The B<--src> option requires a file containing debian source control stanzas,
+separated by one blank line. For instance, the Sources files as found on a
+Debian mirror server, or in the directory I</var/lib/apt/lists/> of a Debian
+system, are suitable.
+
+=cut
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<--deb-native-arch=>I<name>
+
+Specify the native architecture. The default behavior is to deduce
+the native architecture from the first package stanza in the input
+that has an architecture different from all.
+
+=item B<--deb-foreign-archs=>I<name> [,I<name>] ...
+
+Specify a comma-separated list of foreign architectures. The default
+is an empty list of foreign architectures. If B<--deb-host-arch> is set, it
+is used as an implicit foreign architecture.
+
+=item B<--deb-host-arch=>I<name>...
+
+Specify the host architecture. If this option is given, B<--deb-native-arch>
+must also be set.
+
+=item B<-f --failures>
+
+Only show broken packages that fail the installability check.
+
+=item B<-v --successes>
+
+Only show packages that do not fail the installability check.
+
+=item B<-e --explain>
+
+Explain the results in more detail.
+
+=item B<--src=>I<source-repository>
+
+Instead of printing binary packages, print the associated source packages as
+given in the debian Sources file B<source-repository>.
+
+=item B<--dump=>I<cudf-file>
+
+Dump the calculated CUDF universe to B<cudf-file>.
+
+=item B<--fg=>I<binary-repository>
+
+Specify a foreground binary repository.
+
+=item B<--bg=>I<binary-repository>
+
+Specify a background binary repository.
+
+=item B<-v>
+
+Enable info / warnings / debug messages. This option may be repeated up
+to three times in order to increase verbosity.
+
+=item B<-h, --help>
+
+Display this list of options.
+
+=back
+=cut
+
+=head1 EXIT CODES
+
+If a coinstallation set exists, the program returns a zero exit status. If no
+coinstallation set exists, the exit code is one.
+
+=cut
+
+=head1 EXAMPLE
+
+Compute the list of binary packages needed to install all packages marked as
+essential:
+
+ grep-dctrl -X -FEssential yes \
+ 
/var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages
 \
+ > essential
+
+ dose-debcoinstall --deb-native-arch=amd64 \
+ --bg 
/var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages
 \
+ --fg essential > essential_coinstall
+
+Compute the list of source packages needed to build these packages:
+
+ dose-debcoinstall --deb-native-arch=amd64 \
+ --src 
/var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_source_Sources \
+ --bg 
/var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages
 \
+ --fg essential > essential_coinstall_src
+
+=cut
+
+=head1 AUTHOR
+
+The current version has been rewritten on the basis of the dose3 library by
+Pietro Abate.
+
+=head1 SEE ALSO
+
+L<B<deb-control>(5)>,
+L<B<dose3-distcheck>(1)>
+
+<http://www.edos-project.org> is the home page of the EDOS project.
+<http://www.mancoosi.org> is the home page of the Mancoosi project.

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