[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 172e7fa19fba1acc0f0b5ef967317266ac72259a
Merge: 902fcfb6cc0a768e6f64b2fae1b19e9940d260e1 3341dfcd2007188b2508296d5f23ab68f6123d60
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Dec 3 20:01:57 2010 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/dose3
    
    Conflicts:
    	debian/patches/manpages

diff --combined debian/patches/manpages
index 1430a18,4495442..a8c3e5d
--- a/debian/patches/manpages
+++ b/debian/patches/manpages
@@@ -1,18 -1,45 +1,50 @@@
 +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 19:45:22.000000000 +0100
- +++ dose3/doc/manpages/distcheck.1	2010-12-03 19:45:49.000000000 +0100
- @@ -1,4 +1,4 @@
 ---- 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
++--- dose3.orig/doc/manpages/distcheck.1	2010-12-03 20:00:17.000000000 +0100
+++++ dose3/doc/manpages/distcheck.1	2010-12-03 20:00:51.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

-- 
dose3 packaging