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

treinen pushed a commit to branch master
in repository dose3.

commit 9fc98db664f57fd457bd64e18d77695b9464540a
Merge: 5ce37d6 ec45044
Author: Ralf Treinen <trei...@free.fr>
Date:   Tue May 27 08:56:58 2014 +0200

    Merge tag 'upstream/3.2.2'
    
    Upstream version 3.2.2

 CHANGES                                          | 13 ++++
 META.in                                          |  4 +-
 Makefile                                         |  2 +-
 TODO                                             | 11 ++-
 algo/depsolver_int.ml                            |  8 +-
 applications/apt-cudf.ml                         | 92 ++++++++++++++++-------
 applications/challenged.ml                       |  2 +-
 applications/deb-buildcheck.ml                   | 13 ++--
 applications/deb-coinstall.ml                    |  2 +-
 applications/distcheck.ml                        |  2 +-
 applications/outdated.ml                         |  4 +-
 applications/strong-deps.ml                      |  2 +-
 common/cudfSolver.ml                             |  9 ++-
 common/util.ml                                   | 18 ++++-
 common/util.mli                                  |  2 +
 configure                                        | 18 ++---
 configure.ac                                     |  2 +-
 deb/debcudf.ml                                   | 94 +++++++++++++-----------
 deb/debcudf.mli                                  |  6 +-
 deb/edsp.ml                                      | 43 ++++++-----
 deb/format822.ml                                 |  3 +
 deb/format822_parser.mly                         | 28 ++++---
 deb/packages.ml                                  | 30 +++++---
 deb/version.ml                                   | 22 +++---
 debian/patches/binaries-prefix-edos              | 72 +++---------------
 doc/manpages/{coinstall.pod => debcoinstall.pod} | 27 ++++---
 doseparse/stdLoaders.ml                          | 27 ++++---
 doseparse/stdOptions.ml                          | 18 ++---
 doseparse/stdUtils.ml                            | 39 ++++++++++
 29 files changed, 352 insertions(+), 261 deletions(-)

diff --cc debian/patches/binaries-prefix-edos
index 6e61cfc,0000000..13e50bf
mode 100644,000000..100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@@ -1,303 -1,0 +1,251 @@@
 +Author: Ralf Treinen <trei...@debian.org>
 +Description: all binaries have prefix dose-
 +
 +Index: dose3/doc/manpages/distcheck.pod
 +===================================================================
- --- dose3.orig/doc/manpages/distcheck.pod     2014-05-06 19:52:40.105958614 
+0200
- +++ dose3/doc/manpages/distcheck.pod  2014-05-06 19:52:40.105958614 +0200
++--- dose3.orig/doc/manpages/distcheck.pod     2014-05-27 08:57:39.036999728 
+0200
+++++ dose3/doc/manpages/distcheck.pod  2014-05-27 08:57:39.036999728 +0200
 +@@ -1,25 +1,25 @@
 + =head1 NAME
 + 
 +-distcheck - check installability of packages according to metadata 
 ++dose-distcheck - check installability of packages according to metadata 
 + 
 + =head1 SYNOPSIS
 + 
 + =over 
 + 
 +-=item B<distcheck> [option] ... I<uri>
 ++=item B<dose-distcheck> [option] ... I<uri>
 + 
 +-=item B<debcheck> [option] ... [I<file>]
 ++=item B<dose-debcheck> [option] ... [I<file>]
 + 
 +-=item B<rpmcheck> [option] ... [I<file>]
 ++=item B<dose-rpmcheck> [option] ... [I<file>]
 + 
 +-=item B<eclipsecheck> [option] ... [I<file>] 
 ++=item B<dose-eclipsecheck> [option] ... [I<file>] 
 + 
 + =back
 + =cut
 + 
 + =head1 DESCRIPTION
 + 
 +-distcheck determines, for a set of package control stanzas, called the
 ++dose-distcheck determines, for a set of package control stanzas, called the
 + repository, whether packages of the repository can be installed relative to 
the
 + repository according to the inter-package relationsships expressed in the
 + package control stanzas.  The exact set of relevant control fields and their
 +@@ -39,17 +39,17 @@
 + =head1 Input Specification
 + 
 + Currently supported input types are debian, rpm, and eclipse. The
 +-B<distcheck> tool expects its input specifiations in the form
 ++B<dose-distcheck> tool expects its input specifiations in the form
 + I<type://pathname> where I<type> is one of B<deb>, B<synthesis>,
 + B<hdlist> or B<eclipse>, and I<pathname> is the pathname of a file
 + containing the input. The package metadata found in that file must
 + correspond to the I<type> given in the URI.
 + 
 +-When invoked as I<typeB<check>> then the type of input is assumed to
 ++When invoked as I<B<dose->typeB<check>> then the type of input is assumed to
 + be I<type>, and repositories (in positional arguments or in the values of
 + options B<--fg> and B<--bg>) are simply given in form of a pathname of a file
 + containing the repository. If no positional argument is given then input is
 +-read from standard input.  B<distcheck> also compressed files (.gz , .bz2) as
 ++read from standard input.  B<dose-distcheck> also compressed files (.gz , 
.bz2) as
 + positional arguments. Input read on standard input cannot be in compressed
 + form.
 + 
 +@@ -62,7 +62,7 @@
 + The input file has to contain 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 as input to B<debcheck>. Installability of
 ++of a Debian system, are suitable as input to B<dose-debcheck>. 
Installability of
 + packages is analyzed according to their B<Depends>, B<Conflicts>, and 
B<Provides>
 + fields with their meaning as of Debian policy version 3.9.0. B<Pre-depends> 
are
 + treated like B<Depends>, and B<Breaks> are treated like B<Conflicts>.
 +@@ -80,8 +80,8 @@
 + =head2 Rpm
 + 
 + The input file can be either a I<synthesis> file or a I<hdlist> file.  By
 +-default rpmcheck expects a synthesis file as input. To specify a hdlist file
 +-distcheck must be invoked with a file argument of the form hdlist:// 
 ++default dose-rpmcheck expects a synthesis file as input. To specify a hdlist 
file
 ++dose-distcheck must be invoked with a file argument of the form hdlist:// 
 + 
 + =cut
 + 
 +@@ -272,13 +272,13 @@
 + Check which packages in contrib are not installable when dependencies may
 + be satisfied from main:
 +  
 +-  debcheck --failures --bg=main_Packages contrib_Packages
 ++  dose-debcheck --failures --bg=main_Packages contrib_Packages
 + 
 + =cut
 + 
 + =head1 NOTE
 + 
 +-Distcheck is a complete reimplementation of edos-debcheck, written for the 
EDOS
 ++Dose-distcheck is a complete reimplementation of edos-debcheck, written for 
the EDOS
 + project. 
 + 
 + =cut
 +Index: dose3/doc/manpages/buildcheck.pod
 +===================================================================
- --- dose3.orig/doc/manpages/buildcheck.pod    2014-05-06 19:52:40.105958614 
+0200
- +++ dose3/doc/manpages/buildcheck.pod 2014-05-06 19:52:40.105958614 +0200
++--- dose3.orig/doc/manpages/buildcheck.pod    2014-05-27 08:57:39.036999728 
+0200
+++++ dose3/doc/manpages/buildcheck.pod 2014-05-27 08:57:39.036999728 +0200
 +@@ -127,7 +127,7 @@
 + =head1 SEE ALSO
 + 
 + L<B<deb-control>(5)>, 
 +-L<B<dose3-distcheck>(1)> 
 ++L<B<dose-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. 
 +Index: dose3/doc/manpages/outdated.pod
 +===================================================================
- --- dose3.orig/doc/manpages/outdated.pod      2014-05-06 19:52:40.105958614 
+0200
- +++ dose3/doc/manpages/outdated.pod   2014-05-06 19:52:40.105958614 +0200
++--- dose3.orig/doc/manpages/outdated.pod      2014-05-27 08:57:39.036999728 
+0200
+++++ dose3/doc/manpages/outdated.pod   2014-05-27 08:57:39.036999728 +0200
 +@@ -1,16 +1,16 @@
 + =head1 NAME
 + 
 +-outdated - detect uninstallable packages due to obsolete dependencies 
 ++dose-outdated - detect uninstallable packages due to obsolete dependencies 
 + 
 + =head1 SYNOPSIS
 + 
 +-B<outdated> [option] ... I<file> ... 
 ++B<dose-outdated> [option] ... I<file> ... 
 + 
 + =cut
 + 
 + =head1 DESCRIPTION
 + 
 +-B<outdated> identifies in a debian package repository those packages that
 ++B<dose-outdated> identifies in a debian package repository those packages 
that
 + are not installable with respect to that repository by the their 
inter-package
 + relationships (dependencies, conflicts, ...), and that furthermore cannot
 + become installable (in the current version) how matter how the rest of the
 +@@ -28,7 +28,7 @@
 + 
 + =head1 Output Specification
 + 
 +-The output of outdated is in the YAML format. 
 ++The output of dose-outdated is in the YAML format. 
 + 
 + =head1 OPTIONS
 + 
 +@@ -77,7 +77,7 @@
 + 
 + =head1 EXAMPLE
 + 
 +- dose3-outdated -f -v 
/var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages
 ++ dose-outdated -f -v 
/var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages
 + 
 + =cut
 + 
 +@@ -89,8 +89,8 @@
 + 
 + =head1 SEE ALSO
 + 
 +-L<B<distcheck>(5)>
 +-L<B<challenged>(5)> 
 ++L<B<dose-distcheck>(5)>
 ++L<B<dose-challenged>(5)> 
 + 
 + <http://www.mancoosi.org> is the home page of the Mancoosi project. 
 +  
 +Index: dose3/doc/manpages/challenged.pod
 +===================================================================
- --- dose3.orig/doc/manpages/challenged.pod    2014-05-06 19:52:40.105958614 
+0200
- +++ dose3/doc/manpages/challenged.pod 2014-05-06 19:52:40.105958614 +0200
++--- dose3.orig/doc/manpages/challenged.pod    2014-05-27 08:57:39.036999728 
+0200
+++++ dose3/doc/manpages/challenged.pod 2014-05-27 08:57:39.036999728 +0200
 +@@ -1,19 +1,19 @@
 + =head1 NAME
 + 
 +-challenged - detect broken packages due to obsolete dependencies 
 ++dose-challenged - detect broken packages due to obsolete dependencies 
 + 
 + =head1 SYNOPSIS 
 + 
 + =over
 + 
 +-=item B<challenged> [options] I<Packages file(s)> 
 ++=item B<dose-challenged> [options] I<Packages file(s)> 
 + 
 + =back
 + =cut
 + 
 + =head1 DESCRIPTION
 + 
 +-challenged performs a speculative analysis of the repository to identify 
those
 ++B<dose-challenged> performs a speculative analysis of the repository to 
identify those
 + packages that, if upgraded to a specific version, would break a large number 
of
 + other packages in the repository. This tool would be particularly useful 
during
 + the upgrade of a specific component to evaluate its impact on the software
 +@@ -23,13 +23,13 @@
 + 
 + =head1 Input Specification
 + 
 +-The input of challenged is a list of Debian Packages files 
 ++The input of dose-challenged is a list of Debian Packages files 
 + 
 + =cut
 + 
 + =head1 Output Specification
 + 
 +-The output of challenged is in the yaml format.
 ++The output of dose-challenged is in the yaml format.
 + 
 + =cut
 + 
 +@@ -74,7 +74,7 @@
 + 
 + =head1 EXAMPLE
 + 
 +-  challenged -v --progress Packages.bz2 > result.yaml 
 ++  dose-challenged -v --progress Packages.bz2 > result.yaml 
 + 
 + =cut
 + 
 +@@ -88,8 +88,8 @@
 + 
 + =head1 SEE ALSO
 + 
 +-L<B<distcheck>(1)B<>>
 +-L<B<outdated>(1)B<>> 
 ++L<B<dose-distcheck>(1)B<>>
 ++L<B<dose-outdated>(1)B<>> 
 + 
 + <http://www.mancoosi.org> is the home page of the Mancoosi project.
 + 
 +Index: dose3/doc/manpages/ceve.pod
 +===================================================================
- --- dose3.orig/doc/manpages/ceve.pod  2014-05-06 19:52:40.105958614 +0200
- +++ dose3/doc/manpages/ceve.pod       2014-05-06 19:52:40.105958614 +0200
++--- dose3.orig/doc/manpages/ceve.pod  2014-05-27 08:57:39.036999728 +0200
+++++ dose3/doc/manpages/ceve.pod       2014-05-27 08:57:39.036999728 +0200
 +@@ -1,18 +1,18 @@
 + =head1 NAME
 + 
 +-ceve - parse package metadata 
 ++dose-ceve - parse package metadata 
 + 
 + =head1 SYNOPSIS
 + 
 + =over 
 + 
 +-=item B<ceve> [-h] [-v] [-e I<pkgspec>] [-c I<pkgspec>] [-r I<pkgspec>] 
[--depth=I<n>]I<> [-T I<format>] [-G I<graph type>] [-o I<filename>] 
I<input-spec> 
 ++=item B<dose-ceve> [-h] [-v] [-e I<pkgspec>] [-c I<pkgspec>] [-r I<pkgspec>] 
[--depth=I<n>]I<> [-T I<format>] [-G I<graph type>] [-o I<filename>] 
I<input-spec> 
 + 
 + =back
 + 
 + =head1 DESCRIPTION
 + 
 +-Ceve is a generalized metadata parser. It reads package specifications,
 ++Dose-ceve is a generalized metadata parser. It reads package specifications,
 + extracts package metadata from them, performs some manipulations, and outputs
 + the package metadata in one of several formats. 
 + 
- Index: dose3/doc/manpages/coinstall.pod
- ===================================================================
- --- dose3.orig/doc/manpages/coinstall.pod     2014-05-06 19:52:40.105958614 
+0200
- +++ dose3/doc/manpages/coinstall.pod  2014-05-06 19:53:37.118162721 +0200
- @@ -1,19 +1,19 @@
-  =head1 NAME
-  
- -dose-debcoinstall - calculate a coinstallation set of a given set of Debian 
binary packages
- +dose-deb-coinstall - calculate a coinstallation set of a given set of Debian 
binary packages
-  
-  =head1 SYNOPSIS
-  
-  =over
-  
- -=item B<dose-debcoinstall> [options] I<binary-repositories>
- +=item B<dose-deb-coinstall> [options] I<binary-repositories>
-  
-  =back
-  =cut
-  
-  =head1 DESCRIPTION
-  
- -dose-debcoinstall determines whether a set of foreground Debian binary 
packages
- +dose-deb-coinstall 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
- @@ -118,13 +118,13 @@
-   
/var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages
 \
-   > essential
-  
- - dose-debcoinstall --deb-native-arch=amd64 \
- + dose-deb-coinstall --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 \
- + dose-deb-coinstall --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
- @@ -139,7 +139,7 @@
-  =head1 SEE ALSO
-  
-  L<B<deb-control>(5)>,
- -L<B<dose3-distcheck>(1)>
- +L<B<dose-debcheck>(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