[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. upstream/0.7-76-gedd643c

[Ralf Treinen]

The following commit has been merged in the master branch:
commit b71dd8f9c11f7cf24ce82a0a20a5e904ac2734d1
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Dec 3 19:38:53 2010 +0100

    minor fixes to manpages

diff --git a/debian/patches/manpages b/debian/patches/manpages
new file mode 100644
index 0000000..ed90a4e
--- /dev/null
+++ b/debian/patches/manpages
@@ -0,0 +1,112 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: various minor fixes to manpages that are in upstream svn
+  but not released yet. This patch should become obsolete with newer
+  upstream releases.
+
+Index: dose3/doc/manpages/distcheck.1
+===================================================================
+--- dose3.orig/doc/manpages/distcheck.1	2010-12-03 17:07:51.000000000 +0100
++++ dose3/doc/manpages/distcheck.1	2010-12-03 17:08:10.000000000 +0100
+@@ -1,15 +1,15 @@
+-.TH distcheck 1 "November 12, 2010" "Version 3.0" "USER COMMANDS"
++.TH distcheck 1 "December 3, 2010" "Version 2.9" "USER COMMANDS"
+ .SH NAME
+ distcheck \- check installability of packages according to metadata
+ 
+ .SH SYNOPSIS
+ \fBdistcheck\fR [option] ... \fIuri\fR
+ .br
+-\fBdose3-debcheck\fR [option] ... \fIfile\fR
++\fBdebcheck\fR [option] ... \fIfile\fR
+ .br
+-\fBdose3-rpmcheck\fR [option] ... \fIfile\fR
++\fBrpmcheck\fR [option] ... \fIfile\fR
+ .br
+-\fBdose3-eclipsecheck\fR [option] ... \fIfile\fR
++\fBeclipsecheck\fR [option] ... \fIfile\fR
+ 
+ .SH DESCRIPTION
+ .B distcheck
+@@ -41,7 +41,7 @@
+ .I type
+ given in the URI.
+ 
+-When invoked as \fBdose3-\fItype\fBcheck\fR, the type of the repository is
++When invoked as \fItype\fBcheck\fR, the type of the repository is
+ assumed to be \fItype\fR, and the input is simply given in form of a
+ pathname of a file containing the repository.
+ .B debcheck
+@@ -57,7 +57,7 @@
+ 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 as input to
+-\fBdose3-debcheck\fR.
++\fBdebcheck\fR.
+ .P
+ Installability of packages is analyzed according to their
+ \fBDepends\fR, \fBConflicts\fR, and \fBProvides\fR fields with their
+@@ -66,33 +66,35 @@
+ \fBConflicts\fR.
+ .P
+ In the case of Debian, it is not possible to install at the same time
+-two packages with the sqme name but different versions.
++two packages with the same name but different versions.
+ 
+ .SS RPM
+-The input file can be either a \fIsynthesis file or a \fIhdlist file.
+-By default rpmcheck accept a synthesis file. To specify a hdlist file
+-distcheck must be invoked as hdlist://
++The input file can be either a \fIsynthesis\fR file or a \fIhdlist\fR
++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://
+ 
+ .SS Eclipse
+-The input is a 822 file containing the encoding of OSGi plugins 
++The input is an 822 file containing the encoding of OSGi plugins 
+ content.xml files.
+ 
+ .SH OPTIONS
+ .TP
+ .B \-f \-\-failures
+-Only show broken package that fails the installability test.
++Only show broken packages that fail the installability check.
+ .TP
+ .B \-v \-\-successes
+-Only show packages that do not fail the installability test.
++Only show packages that do not fail the installability check.
+ .TP
+ .B \-e \-\-explain
+-Explain the results in more details.
++Explain the results in more detail.
+ .TP
+ .B \-\-checkonly
+-Select a subsets of packages to check. By default all packages are checked.
++Select a subset of packages to check. By default all packages are checked.
+ .TP
+ .B \-v
+-Enable info / warnings / debug message. It can be repeated up to three times
++Enable info / warnings / debug messages. This option may be repeated
++up to three times in order to increase verbosity.
+ .TP
+ .B \-\-progress
+ Enable progress bars.
+@@ -102,13 +104,13 @@
+ 
+ .SH EXIT CODE
+ The exit code is 0 when all packages that were asked to be checked
+-(either explicitly with the \-\-checkonly option, or because they exist
+-in the package pool file) are available and found to be installable,
+-it is 1 when a least one of these packages is available but not
++(either explicitly with the \-\-checkonly option, or because they
++exist in the repository) are available and found to be installable, it
++is 1 when a least one of these packages is available but not
+ installable, and it is 2 when at least one of the packages is not
+ available but all available packages are found to be
+-installable. Hence, the exit code 2 can occur only when the \-\-checkonly
+-option is used.
++installable. Hence, the exit code 2 can occur only when the
++\-\-checkonly option is used.
+ 
+ .SH EXAMPLE
+ Check which packages in a particular distribution are not installable and why:
diff --git a/debian/patches/series b/debian/patches/series
index 9dceec7..f9640d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+manpages
 binaries-prefix-edos

-- 
dose3 packaging