This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository dose3.
commit 300cbe86c78c7e2c4e3a421558eaa1954e2954f2 Author: Ralf Treinen <trei...@free.fr> Date: Mon Oct 20 20:17:33 2014 +0200 new upstream version. Adapt patches, remove applied patches --- debian/changelog | 9 +++- debian/patches/binaries-prefix-edos | 28 ++++++------ debian/patches/buildcheck-manpage | 18 -------- debian/patches/buildcheck-manpage-native-arch | 66 --------------------------- debian/patches/buildcheck-redirect-output | 26 ++--------- debian/patches/coinstall-binary-name | 8 ++-- debian/patches/series | 3 -- 7 files changed, 28 insertions(+), 130 deletions(-) diff --git a/debian/changelog b/debian/changelog index e443033..dba32f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -dose3 (3.2.2-4) UNRELEASED; urgency=medium +dose3 (3.3~beta1-1) UNRELEASED; urgency=low + * new upstream version: + - refreshed patches: + binaries-prefix-edos,coinstall-binary-name,buildcheck-redirect-output + - dropped patches that were integrated upstream: + buildcheck-manpage,buildcheck-manpage-native-arch,multiarch-accept-value-no * add rudimentary as-installed package checks - -- Ralf Treinen <trei...@debian.org> Fri, 17 Oct 2014 20:54:48 +0200 + -- Ralf Treinen <trei...@debian.org> Mon, 20 Oct 2014 19:59:11 +0200 dose3 (3.2.2-3) unstable; urgency=medium diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos index 13e50bf..1ae063f 100644 --- a/debian/patches/binaries-prefix-edos +++ b/debian/patches/binaries-prefix-edos @@ -3,8 +3,8 @@ Description: all binaries have prefix dose- Index: dose3/doc/manpages/distcheck.pod =================================================================== ---- 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 +--- dose3.orig/doc/manpages/distcheck.pod 2014-10-20 19:59:39.694565274 +0200 ++++ dose3/doc/manpages/distcheck.pod 2014-10-20 19:59:39.694565274 +0200 @@ -1,25 +1,25 @@ =head1 NAME @@ -78,7 +78,7 @@ Index: dose3/doc/manpages/distcheck.pod =cut -@@ -272,13 +272,13 @@ +@@ -278,13 +278,13 @@ Check which packages in contrib are not installable when dependencies may be satisfied from main: @@ -96,9 +96,9 @@ Index: dose3/doc/manpages/distcheck.pod =cut Index: dose3/doc/manpages/buildcheck.pod =================================================================== ---- 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 @@ +--- dose3.orig/doc/manpages/buildcheck.pod 2014-10-20 19:59:39.694565274 +0200 ++++ dose3/doc/manpages/buildcheck.pod 2014-10-20 19:59:39.694565274 +0200 +@@ -172,7 +172,7 @@ =head1 SEE ALSO L<B<deb-control>(5)>, @@ -109,8 +109,8 @@ Index: dose3/doc/manpages/buildcheck.pod <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-27 08:57:39.036999728 +0200 -+++ dose3/doc/manpages/outdated.pod 2014-05-27 08:57:39.036999728 +0200 +--- dose3.orig/doc/manpages/outdated.pod 2014-10-20 19:59:39.694565274 +0200 ++++ dose3/doc/manpages/outdated.pod 2014-10-20 19:59:39.694565274 +0200 @@ -1,16 +1,16 @@ =head1 NAME @@ -140,7 +140,7 @@ Index: dose3/doc/manpages/outdated.pod =head1 OPTIONS -@@ -77,7 +77,7 @@ +@@ -83,7 +83,7 @@ =head1 EXAMPLE @@ -149,7 +149,7 @@ Index: dose3/doc/manpages/outdated.pod =cut -@@ -89,8 +89,8 @@ +@@ -95,8 +95,8 @@ =head1 SEE ALSO @@ -162,8 +162,8 @@ Index: dose3/doc/manpages/outdated.pod Index: dose3/doc/manpages/challenged.pod =================================================================== ---- 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 +--- dose3.orig/doc/manpages/challenged.pod 2014-10-20 19:59:39.694565274 +0200 ++++ dose3/doc/manpages/challenged.pod 2014-10-20 19:59:39.694565274 +0200 @@ -1,19 +1,19 @@ =head1 NAME @@ -225,8 +225,8 @@ Index: dose3/doc/manpages/challenged.pod Index: dose3/doc/manpages/ceve.pod =================================================================== ---- 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 +--- dose3.orig/doc/manpages/ceve.pod 2014-10-20 19:59:39.694565274 +0200 ++++ dose3/doc/manpages/ceve.pod 2014-10-20 19:59:39.694565274 +0200 @@ -1,18 +1,18 @@ =head1 NAME diff --git a/debian/patches/buildcheck-manpage b/debian/patches/buildcheck-manpage deleted file mode 100644 index 5bf1e16..0000000 --- a/debian/patches/buildcheck-manpage +++ /dev/null @@ -1,18 +0,0 @@ -Author: Daniel Lintott <dan...@serverb.co.uk> -Description: extend explanation of the -e option of buildcheck -Debian-Bug: #750078 - ---- dose3.orig/doc/manpages/buildcheck.pod 2014-06-06 22:11:43.966609739 +0200 -+++ dose3/doc/manpages/buildcheck.pod 2014-06-06 22:11:43.966609739 +0200 -@@ -81,7 +81,10 @@ - - =item B<-e --explain> - --Explain the results in more detail. -+Give explanations. If used together with --failures then the explanation -+consists of dependency chains leading to a conflict or a dependency on a -+missing package. If used together with --successes then the explanation -+consists of an installation set. - - =item B<-v> - diff --git a/debian/patches/buildcheck-manpage-native-arch b/debian/patches/buildcheck-manpage-native-arch deleted file mode 100644 index f7d0458..0000000 --- a/debian/patches/buildcheck-manpage-native-arch +++ /dev/null @@ -1,66 +0,0 @@ -Author: Ralf Treinen <trei...@debian.org> -Description: dose-builddebcheck manpage: --deb-native-arch is mandatory -Forwarded: upstream git commit 2c8d32e006378d36d226a1058f3d7df3d57af98b -Debian-bug: #757641 - -Index: dose3/doc/manpages/buildcheck.pod -=================================================================== ---- dose3.orig/doc/manpages/buildcheck.pod 2014-08-11 19:29:41.079753743 +0200 -+++ dose3/doc/manpages/buildcheck.pod 2014-08-11 19:29:41.075753743 +0200 -@@ -6,27 +6,30 @@ - - =over - --=item B<dose-builddebcheck> [options] I<binary-repositories> I<source-repository> -+=item B<dose-builddebcheck> B<--deb-native-arch=>I<name> [options] I<binary-repositories> I<source-repository> - - =back - =cut - - =head1 DESCRIPTION - --dose-builddebcheck determines, for a set of debian source package control --stanzas, called the source repository, whether a build environment for the --packages of the source repository can be installed by using packages from the --binary repository. For this, only package meta-information is taken into --account: build-dependencies and build-conflicts in the source package, and --inter-package relationsships expressed in the binary repository. The constraint --solving algorithm is complete, that is it finds a solution whenever there --exists one, even for multiple disjunctive dependencies and deep package --conflicts. This problem is computationally infeasible in theory (that is, --NP-complete), but can be solved very efficiently for package repositories that --actually occur in practice. Installability of binary 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>. -+dose-builddebcheck determines, for a set of debian source package -+control stanzas, called the source repository, whether a build -+environment for the packages of the source repository can be installed -+on the specified native architecture by using packages from the binary -+repository. For this, only package meta-information is taken into -+account: build-dependencies and build-conflicts in the source package, -+and inter-package relationsships expressed in the binary -+repository. The constraint solving algorithm is complete, that is it -+finds a solution whenever there exists one, even for multiple -+disjunctive dependencies and deep package conflicts. This problem is -+computationally infeasible in theory (that is, NP-complete), but can -+be solved very efficiently for package repositories that actually -+occur in practice. Installability of binary 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>. - - =cut - -@@ -56,9 +59,7 @@ - - =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. -+Specify the native architecture. This argument is mandatory. - - =item B<--deb-foreign-archs=>I<name> [,I<name>] ... - diff --git a/debian/patches/buildcheck-redirect-output b/debian/patches/buildcheck-redirect-output index 49ee31d..db3bd91 100644 --- a/debian/patches/buildcheck-redirect-output +++ b/debian/patches/buildcheck-redirect-output @@ -5,9 +5,9 @@ Upstream-commit: 72dcb2efa9c8e9a5f127afd9b27fdbca4ce03a76 Index: dose3/doc/manpages/buildcheck.pod =================================================================== ---- dose3.orig/doc/manpages/buildcheck.pod 2014-09-14 20:46:15.813165184 +0200 -+++ dose3/doc/manpages/buildcheck.pod 2014-09-14 20:46:15.813165184 +0200 -@@ -96,6 +96,10 @@ +--- dose3.orig/doc/manpages/buildcheck.pod 2014-10-20 20:15:26.362580585 +0200 ++++ dose3/doc/manpages/buildcheck.pod 2014-10-20 20:15:26.358580585 +0200 +@@ -125,6 +125,10 @@ Display this list of options. @@ -18,23 +18,3 @@ Index: dose3/doc/manpages/buildcheck.pod =back =cut -Index: dose3/applications/deb-buildcheck.ml -=================================================================== ---- dose3.orig/applications/deb-buildcheck.ml 2014-09-14 20:46:00.000000000 +0200 -+++ dose3/applications/deb-buildcheck.ml 2014-09-14 20:47:36.185164790 +0200 -@@ -64,8 +64,13 @@ - Boilerplate.enable_timers (OptParse.Opt.get Options.timers) ["Solver"]; - Util.Debug.disable "Depsolver_int"; - Boilerplate.all_quiet (OptParse.Opt.get Options.quiet); -- -- let fmt = Format.std_formatter in -+ let fmt = -+ if OptParse.Opt.is_set Options.outfile then -+ let oc = open_out (OptParse.Opt.get Options.outfile) in -+ Format.formatter_of_out_channel oc -+ else -+ Format.std_formatter -+ in - if OptParse.Opt.is_set Options.deb_native_arch then - Format.fprintf fmt "native-architecture: %s@." (OptParse.Opt.get Options.deb_native_arch) - else diff --git a/debian/patches/coinstall-binary-name b/debian/patches/coinstall-binary-name index f8c38b4..4669abc 100644 --- a/debian/patches/coinstall-binary-name +++ b/debian/patches/coinstall-binary-name @@ -4,12 +4,12 @@ Description: accept "dose-deb-coinstall" as alternative name of the Index: dose3/applications/deb-coinstall.ml =================================================================== ---- dose3.orig/applications/deb-coinstall.ml 2014-05-06 08:53:17.634759160 +0200 -+++ dose3/applications/deb-coinstall.ml 2014-05-06 19:59:02.267325553 +0200 -@@ -255,5 +255,5 @@ +--- dose3.orig/applications/deb-coinstall.ml 2014-10-20 20:01:54.970567462 +0200 ++++ dose3/applications/deb-coinstall.ml 2014-10-20 20:02:19.098567853 +0200 +@@ -256,5 +256,5 @@ ;; - Boilerplate.if_application + StdUtils.if_application -~alternatives:["dose-debcoinstall";"deb-coinstall"] __FILE__ main ;; +~alternatives:["dose-deb-coinstall";"deb-coinstall"] __FILE__ main ;; diff --git a/debian/patches/series b/debian/patches/series index 46d12c6..9d1710e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ binaries-prefix-edos coinstall-binary-name -buildcheck-manpage -buildcheck-manpage-native-arch -multiarch-accept-value-no buildcheck-redirect-output -- 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