The following commit has been merged in the master branch: commit 413946472112afcce47ed7296b347bdbf470cf47 Author: Ralf Treinen <trei...@free.fr> Date: Tue Feb 7 18:51:50 2012 +0100
binaries and packages have prefix dose- now. diff --git a/debian/changelog b/debian/changelog index 47a6355..b1f53d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ dose3 (2.9.12-1) UNRELEASED; urgency=low * New upstream release * The ceve package has disapperaed, we have instead now a new package - edos-extra that contains all tools that do not deserve their own + dose-extra that contains all tools that do not deserve their own package (for the moment: ceve, outdated, challenged). + * Packages for distcheck and builddebcheck have prefix dose- now. + Binaries (except ceve and apt-cudf) also have prefix dose. * debian/rules: - configuration option --with-rpm has become --with-rpm4 - upstream has fixed installation of algo.a, we can now remove our own diff --git a/debian/control b/debian/control index 90e139c..e9d39f4 100644 --- a/debian/control +++ b/debian/control @@ -56,7 +56,7 @@ Description: OCaml libraries for package dependencies (runtime files) . This package contains only the shared runtime stub libraries. -Package: dose3-distcheck +Package: dose-distcheck Section: devel Architecture: any Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends} @@ -71,7 +71,7 @@ Description: Checks whether dependencies of packages can be satisfied edos-distcheck. Until then, the name of the package or of the binaries, as well as command line options and output format, are subject to change. -Package: dose3-builddebcheck +Package: dose-builddebcheck Section: devel Architecture: any Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends} @@ -85,7 +85,7 @@ Description: Checks whether build-dependencies can be satisfied edos-distcheck. Until then, the name of the package or of the binary, as well as command line options and output format, are subject to change. -Package: edos-extra +Package: dose-extra Section: devel Architecture: any Provides: ceve diff --git a/debian/dose-builddebcheck.install b/debian/dose-builddebcheck.install new file mode 100644 index 0000000..e8a6dc3 --- /dev/null +++ b/debian/dose-builddebcheck.install @@ -0,0 +1 @@ +usr/bin/dose-builddebcheck diff --git a/debian/dose-builddebcheck.manpages b/debian/dose-builddebcheck.manpages new file mode 100644 index 0000000..d6662f7 --- /dev/null +++ b/debian/dose-builddebcheck.manpages @@ -0,0 +1 @@ +doc/manpages/buildcheck.1 diff --git a/debian/dose-distcheck.install b/debian/dose-distcheck.install new file mode 100644 index 0000000..a52c51a --- /dev/null +++ b/debian/dose-distcheck.install @@ -0,0 +1 @@ +usr/bin/dose-distcheck diff --git a/debian/dose-distcheck.links b/debian/dose-distcheck.links new file mode 100644 index 0000000..1fb5fa6 --- /dev/null +++ b/debian/dose-distcheck.links @@ -0,0 +1,6 @@ +usr/bin/dose-distcheck usr/bin/dose-debcheck +usr/bin/dose-distcheck usr/bin/dose-rpmcheck +usr/bin/dose-distcheck usr/bin/dose-eclipsecheck +usr/share/man/man1/dose-distcheck.1 usr/share/man/man1/dose-debcheck.1 +usr/share/man/man1/dose-distcheck.1 usr/share/man/man1/dose-rpmcheck.1 +usr/share/man/man1/dose-distcheck.1 usr/share/man/man1/dose-eclipsecheck.1 diff --git a/debian/dose3-distcheck.manpages b/debian/dose-distcheck.manpages similarity index 100% rename from debian/dose3-distcheck.manpages rename to debian/dose-distcheck.manpages diff --git a/debian/edos-extra.NEWS b/debian/dose-extra.NEWS similarity index 100% rename from debian/edos-extra.NEWS rename to debian/dose-extra.NEWS diff --git a/debian/dose-extra.install b/debian/dose-extra.install new file mode 100644 index 0000000..f3352e2 --- /dev/null +++ b/debian/dose-extra.install @@ -0,0 +1,4 @@ +usr/bin/ceve +usr/bin/dose-outdated +usr/bin/dose-challenged + diff --git a/debian/edos-extra.manpages b/debian/dose-extra.manpages similarity index 100% rename from debian/edos-extra.manpages rename to debian/dose-extra.manpages diff --git a/debian/dose3-builddebcheck.install b/debian/dose3-builddebcheck.install deleted file mode 100644 index eeb5bb9..0000000 --- a/debian/dose3-builddebcheck.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/dose3-builddebcheck diff --git a/debian/dose3-builddebcheck.manpages b/debian/dose3-builddebcheck.manpages deleted file mode 100644 index ad78d84..0000000 --- a/debian/dose3-builddebcheck.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/manpages/dose3-builddebcheck.1 diff --git a/debian/dose3-distcheck.install b/debian/dose3-distcheck.install deleted file mode 100644 index 97aed49..0000000 --- a/debian/dose3-distcheck.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/dose3-distcheck diff --git a/debian/dose3-distcheck.links b/debian/dose3-distcheck.links deleted file mode 100644 index de0d363..0000000 --- a/debian/dose3-distcheck.links +++ /dev/null @@ -1,6 +0,0 @@ -usr/bin/dose3-distcheck usr/bin/dose3-debcheck -usr/bin/dose3-distcheck usr/bin/dose3-rpmcheck -usr/bin/dose3-distcheck usr/bin/dose3-eclipsecheck -usr/share/man/man1/dose3-distcheck.1 usr/share/man/man1/dose3-debcheck.1 -usr/share/man/man1/dose3-distcheck.1 usr/share/man/man1/dose3-rpmcheck.1 -usr/share/man/man1/dose3-distcheck.1 usr/share/man/man1/dose3-eclipsecheck.1 diff --git a/debian/edos-extra.install b/debian/edos-extra.install deleted file mode 100644 index 359078f..0000000 --- a/debian/edos-extra.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/bin/ceve -usr/bin/edos-outdated -usr/bin/edos-challenged - diff --git a/debian/manpages/dose3-builddebcheck.1 b/debian/manpages/dose3-builddebcheck.1 deleted file mode 100644 index 79f7855..0000000 --- a/debian/manpages/dose3-builddebcheck.1 +++ /dev/null @@ -1,86 +0,0 @@ -.TH dose3-buildcheck 1 "December 4, 2010" "Version 2.9" "USER COMMANDS" -.SH NAME -dose3-buildcheck \- check installability of build-dependencies - -.SH SYNOPSIS -\fBdose3-buildcheck\fR [option] ... \fIbinary-repository\fR \fIsource-repository\fR - -.SH DESCRIPTION -.B dose3-buildcheck -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. -.P -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. -.P -Installability of binary packages is analyzed according to their -\fBDepends\fR, \fBConflicts\fR, and \fBProvides\fR fields with their -meaning as of Debian policy version 3.9.0. \fBPre-depends\fR are -treated like \fBDepends\fR, and \fBBreaks\fR are treated like -\fBConflicts\fR. - -.SH INPUT FORMAT - -The \fBbinary-repository\fR argument is the name of a file containing -stanzas in the format of deb-control(5), separated by one blank -line. For instance, the Packages files as found on a Debian mirror -server, or in the directory \fI/var/lib/apt/lists/\fR of a Debian -system, are suitable. -.P -The \fBsource-repository\fR argument is the name of 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 \fI/var/lib/apt/lists/\fR of a Debian -system, are suitable. - -.SH OPTIONS -.TP -.B \-a \-\-architecture -Specify the architecture for which installability of build -environments should be checked. This argument is (in the current -version of this program) mandatory. -.TP -.B \-f \-\-failures -Only show broken packages that fail the installability check. -.TP -.B \-v \-\-successes -Only show packages that do not fail the installability check. -.TP -.B \-e \-\-explain -Explain the results in more detail. -.TP -.B \-v -Enable info / warnings / debug messages. This option may be repeated -up to three times in order to increase verbosity. -.TP -.B \-h, \-\-help -Display this list of options. - -.SH EXAMPLE -Compute the list of source packages in Sources for which it is not possible -to install a build environment on i386, assuming that the binary packages -described in file Packages are available: - -dose3-builddebcheck --architecture i386 --failures --explain Packages Sources - -.SH AUTHOR -The current version has been rewritten on the basis of the dose3 -library by Pietro Abate; it replaces an earlier version that was -simply a wrapper for edos-distcheck. - -.SH SEE ALSO -.BR deb-control (5), -.BR 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. - diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos index 74fe132..dd753a2 100644 --- a/debian/patches/binaries-prefix-edos +++ b/debian/patches/binaries-prefix-edos @@ -1,22 +1,31 @@ Author: Ralf Treinen <trei...@debian.org> -Description: all binaries have prefix dose3- +Description: all binaries have prefix dose- Index: dose3/doc/manpages/distcheck.pod =================================================================== ---- dose3.orig/doc/manpages/distcheck.pod 2012-02-06 20:01:28.000000000 +0100 -+++ dose3/doc/manpages/distcheck.pod 2012-02-06 20:05:39.000000000 +0100 -@@ -1,19 +1,19 @@ +--- dose3.orig/doc/manpages/distcheck.pod 2012-02-07 18:36:35.000000000 +0100 ++++ dose3/doc/manpages/distcheck.pod 2012-02-07 18:44:31.000000000 +0100 +@@ -1,25 +1,25 @@ =head1 NAME -distcheck - check installability of packages according to metadata -+dose3-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> B<debcheck> [option] ... I<file> B<rpmcheck> [option] ... I<file> B<eclipsecheck> [option] ... I<file> -+=item B<dose3-distcheck> [option] ... I<uri> B<dose3-debcheck> [option] ... I<file> B<dose3-rpmcheck> [option] ... I<file> B<dose3-eclipsecheck> [option] ... I<file> +-=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 @@ -24,85 +33,85 @@ Index: dose3/doc/manpages/distcheck.pod =head1 DESCRIPTION -distcheck determines, for a set of package control stanzas, called the -+dose3-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 -@@ -28,13 +28,13 @@ +@@ -39,13 +39,13 @@ =head1 Input Specification Currently supported repository types are debian, rpm, and eclipse. The -B<distcheck> tool expects its input specifiation in the form I<type://pathname> -+B<dose3-distcheck> tool expects its input specifiation in the form I<type://pathname> ++B<dose-distcheck> tool expects its input specifiation 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>>, the type of the repository is assumed to be +-When invoked as I<typeB<check>>, the type of the repository is assumed to be ++When invoked as B<dose->I<type>B<check>, the type of the repository is assumed to be I<type>, and the input is simply given in form of a pathname of a file --containing the repository. B<debcheck> accepts in addition B<--> as input -+containing the repository. B<dose3-debcheck> accepts in addition B<--> as input - specification, with the effect that input is taken from standard input. +-containing the repository. B<debcheck> reads package descriptions from ++containing the repository. B<dose-debcheck> reads package descriptions from + standard input in case no file argument is provided. - =head1 Input Formats -@@ -46,7 +46,7 @@ + +@@ -58,7 +58,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<dose3-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>. In the case -@@ -59,7 +59,7 @@ +@@ -71,7 +71,7 @@ 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:// -+dose3-distcheck must be invoked with a file argument of the form hdlist:// ++dose-distcheck must be invoked with a file argument of the form hdlist:// =cut -@@ -122,7 +122,7 @@ +@@ -177,7 +177,7 @@ Check which packages in a particular distribution are not installable and why: - debcheck --failures --explain < Packages -+ dose3-debcheck --failures --explain < Packages ++ dose-debcheck --failures --explain < Packages where Packages is the file pertaining to that distribution, as for instance found in the directory B</var/lib/apt/lists>. -@@ -131,14 +131,14 @@ +@@ -185,13 +185,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 -+Dose3-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 - - =head1 AUTHOR - --The first version of debcheck was written by Jerome Vouillon for the EDOS -+The first version of dose3-debcheck was written by Jerome Vouillon for the EDOS - project. The current version has been rewritten on the basis of the dose3 - library by Pietro Abate. - Index: dose3/applications/distcheck.ml =================================================================== ---- dose3.orig/applications/distcheck.ml 2012-02-06 20:01:28.000000000 +0100 -+++ dose3/applications/distcheck.ml 2012-02-06 20:06:09.000000000 +0100 -@@ -72,10 +72,10 @@ +--- dose3.orig/applications/distcheck.ml 2012-02-07 18:36:35.000000000 +0100 ++++ dose3/applications/distcheck.ml 2012-02-07 18:45:09.000000000 +0100 +@@ -64,10 +64,10 @@ let posargs = let args = OptParse.OptParser.parse_argv Options.options in match Filename.basename(Sys.argv.(0)),args with - |("debcheck"|"edos-debcheck"),[] -> ["deb://-"] - |("debcheck"|"edos-debcheck"),l -> List.map ((^) "deb://") l -+ |("debcheck"|"dose3-debcheck"),[] -> ["deb://-"] -+ |("debcheck"|"dose3-debcheck"),l -> List.map ((^) "deb://") l ++ |("debcheck"|"dose-debcheck"),[] -> ["deb://-"] ++ |("debcheck"|"dose-debcheck"),l -> List.map ((^) "deb://") l |"eclipsecheck",l -> List.map ((^) "eclipse://") l - |("rpmcheck"|"edos-rpmcheck"),l -> List.map ((^) "synth://") l -+ |("rpmcheck"|"dose3-rpmcheck"),l -> List.map ((^) "synth://") l ++ |("rpmcheck"|"dose-rpmcheck"),l -> List.map ((^) "synth://") l |_,_ -> args in Boilerplate.enable_debug (OptParse.Opt.get Options.verbose); diff --git a/debian/rules b/debian/rules index 755cbd6..6574679 100755 --- a/debian/rules +++ b/debian/rules @@ -9,18 +9,20 @@ override_dh_auto_configure: override_dh_auto_install: dh_auto_install cd debian/tmp/usr/bin \ - && mv distcheck dose3-distcheck \ - && mv deb-buildcheck dose3-builddebcheck \ - && mv outdated edos-outdated \ - && mv challenged edos-challenged + && mv distcheck dose-distcheck \ + && mv deb-buildcheck dose-builddebcheck \ + && mv outdated dose-outdated \ + && mv challenged dose-challenged override_dh_installman: dh_installman - cd debian/dose3-distcheck/usr/share/man/man1 \ - && mv distcheck.1 dose3-distcheck.1 - cd debian/edos-extra/usr/share/man/man1 \ - && mv outdated.1 edos-outdated.1 \ - && mv challenged.1 edos-challenged.1 + cd debian/dose-distcheck/usr/share/man/man1 \ + && mv distcheck.1 dose-distcheck.1 + cd debian/dose-extra/usr/share/man/man1 \ + && mv outdated.1 dose-outdated.1 \ + && mv challenged.1 dose-challenged.1 + cd debian/dose-builddebcheck/usr/share/man/man1 \ + && mv buildcheck.1 dose-builddebcheck.1 override_dh_auto_build: dh_auto_build -- dose3 packaging _______________________________________________ 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