This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository dose3.
commit 92d51f5f0f0f98b8b69f56029784ccc175200306 Author: Ralf Treinen <trei...@free.fr> Date: Wed Aug 26 21:05:51 2015 +0200 update debian patches --- debian/changelog | 10 +++- debian/patches/binaries-prefix-edos | 85 +++++++++++++++++------------- debian/patches/coinstall-binary-name | 10 ++-- debian/patches/remove_src_prefix_from_name | 21 -------- debian/patches/series | 7 ++- 5 files changed, 64 insertions(+), 69 deletions(-) diff --git a/debian/changelog b/debian/changelog index dec3695..ce31fe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,14 @@ dose3 (4.0-1) unstable; urgency=medium - * New upstream release + * New upstream release: + - refresh patches: + binaries-prefix-edos + coinstall-binary-name + - deactivate patches: + cudfSolver-fix-leaking-fds + encode-package-name-in-cudf_extras + remove_src_prefix_from_name + librpm-4.12 * drop the edos-distcheck transitional package. -- Ralf Treinen <trei...@debian.org> Wed, 26 Aug 2015 20:25:19 +0200 diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos index 4cbf1eb..2df91f1 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 2015-06-21 19:00:22.441940693 +0200 -+++ dose3/doc/manpages/distcheck.pod 2015-06-21 19:00:22.433940660 +0200 +--- dose3.orig/doc/manpages/distcheck.pod 2015-08-26 21:14:16.570279286 +0200 ++++ dose3/doc/manpages/distcheck.pod 2015-08-26 21:14:16.566279272 +0200 @@ -1,25 +1,25 @@ =head1 NAME @@ -78,7 +78,7 @@ Index: dose3/doc/manpages/distcheck.pod =cut -@@ -278,13 +278,13 @@ +@@ -280,13 +280,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 2015-06-21 19:00:22.441940693 +0200 -+++ dose3/doc/manpages/buildcheck.pod 2015-06-21 19:00:22.433940660 +0200 -@@ -172,7 +172,7 @@ +--- dose3.orig/doc/manpages/buildcheck.pod 2015-08-26 21:14:16.570279286 +0200 ++++ dose3/doc/manpages/buildcheck.pod 2015-08-26 21:14:16.566279272 +0200 +@@ -180,7 +180,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 2015-06-21 19:00:22.441940693 +0200 -+++ dose3/doc/manpages/outdated.pod 2015-06-21 19:00:22.433940660 +0200 +--- dose3.orig/doc/manpages/outdated.pod 2015-08-26 21:14:16.570279286 +0200 ++++ dose3/doc/manpages/outdated.pod 2015-08-26 21:14:16.566279272 +0200 @@ -1,16 +1,16 @@ =head1 NAME @@ -162,8 +162,8 @@ Index: dose3/doc/manpages/outdated.pod Index: dose3/doc/manpages/challenged.pod =================================================================== ---- dose3.orig/doc/manpages/challenged.pod 2015-06-21 19:00:22.441940693 +0200 -+++ dose3/doc/manpages/challenged.pod 2015-06-21 19:00:22.433940660 +0200 +--- dose3.orig/doc/manpages/challenged.pod 2015-08-26 21:14:16.570279286 +0200 ++++ dose3/doc/manpages/challenged.pod 2015-08-26 21:14:16.566279272 +0200 @@ -1,19 +1,19 @@ =head1 NAME @@ -223,36 +223,10 @@ Index: dose3/doc/manpages/challenged.pod <http://www.mancoosi.org> is the home page of the Mancoosi project. -Index: dose3/doc/manpages/ceve.pod -=================================================================== ---- dose3.orig/doc/manpages/ceve.pod 2015-06-21 19:00:22.441940693 +0200 -+++ dose3/doc/manpages/ceve.pod 2015-06-21 19:00:22.433940660 +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/debcoinstall.pod =================================================================== ---- dose3.orig/doc/manpages/debcoinstall.pod 2015-06-21 19:00:08.505881877 +0200 -+++ dose3/doc/manpages/debcoinstall.pod 2015-06-21 19:02:10.170399531 +0200 +--- dose3.orig/doc/manpages/debcoinstall.pod 2015-08-26 21:14:16.570279286 +0200 ++++ dose3/doc/manpages/debcoinstall.pod 2015-08-26 21:14:16.566279272 +0200 @@ -1,19 +1,19 @@ =head1 NAME @@ -292,3 +266,38 @@ Index: dose3/doc/manpages/debcoinstall.pod --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 +Index: dose3/doc/manpages/ceve.pod +=================================================================== +--- dose3.orig/doc/manpages/ceve.pod 2015-08-26 21:14:12.134264139 +0200 ++++ dose3/doc/manpages/ceve.pod 2015-08-26 21:15:22.378509352 +0200 +@@ -1,18 +1,18 @@ + =head1 NAME + +-ceve - parse package metadata ++dose-ceve - parse package metadata + + =head1 SYNOPSIS + + =over + +-=item B<ceve> [-h] [-v] [-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] [-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. + +@@ -153,7 +153,7 @@ + + =head2 DEBIAN SPECIFIC OPTIONS + +-Multi-arch annotations are handled by ceve. Packages whose's architecture is ++Multi-arch annotations are handled by dose-ceve. Packages whose's architecture is + neither the native architecture nor in the list of foreign architectures (see + below) are ignored. + diff --git a/debian/patches/coinstall-binary-name b/debian/patches/coinstall-binary-name index 4669abc..31c6053 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-10-20 20:01:54.970567462 +0200 -+++ dose3/applications/deb-coinstall.ml 2014-10-20 20:02:19.098567853 +0200 -@@ -256,5 +256,5 @@ +--- dose3.orig/applications/deb-coinstall.ml 2015-08-26 20:33:28.801372352 +0200 ++++ dose3/applications/deb-coinstall.ml 2015-08-26 20:34:06.173449333 +0200 +@@ -251,5 +251,5 @@ ;; StdUtils.if_application --~alternatives:["dose-debcoinstall";"deb-coinstall"] __FILE__ main ;; -+~alternatives:["dose-deb-coinstall";"deb-coinstall"] __FILE__ main ;; +-~alternatives:["dose-debcoinstall";"deb-coinstall"] __label main ;; ++~alternatives:["dose-deb-coinstall";"deb-coinstall"] __label main ;; diff --git a/debian/patches/remove_src_prefix_from_name b/debian/patches/remove_src_prefix_from_name deleted file mode 100644 index a8cb9b4..0000000 --- a/debian/patches/remove_src_prefix_from_name +++ /dev/null @@ -1,21 +0,0 @@ -commit 0e00e5a50885fd0a57dec91245a4bc0facde780a -Author: josch <j.scha...@email.de> -Date: Thu Mar 26 01:49:07 2015 +0100 - - remove src: prefix from name in cudf_extras - ---- a/deb/debcudf.ml -+++ b/deb/debcudf.ml -@@ -325,7 +325,11 @@ let preamble = - - let add_extra_default extras tables pkg = - let check = function [] :: _ -> failwith (Printf.sprintf "Malformed dep (%s %s)" pkg.name pkg.version) |l -> l in -- let name = ("name",`String pkg.name) in -+ let name = if String.starts_with pkg.name "src:" then -+ String.sub pkg.name 4 ((String.length pkg.name) - 4) -+ else pkg.name -+ in -+ let name = ("name",`String name) in - let number = ("number",`String pkg.version) in - let architecture = ("architecture",`String pkg.architecture) in - let priority = ("priority",`String pkg.priority) in diff --git a/debian/patches/series b/debian/patches/series index 32c4176..27278cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ binaries-prefix-edos coinstall-binary-name -cudfSolver-fix-leaking-fds -encode-package-name-in-cudf_extras -remove_src_prefix_from_name -librpm-4.12 +# cudfSolver-fix-leaking-fds +# encode-package-name-in-cudf_extras +# librpm-4.12 -- 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