[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

Sun May 15 17:32:32 UTC 2011

The following commit has been merged in the master branch:
commit 684b916897524007d6644346ccb746860ff018b5
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun May 15 18:59:15 2011 +0200

    refresh patch for binary prefix dose3-

diff --git a/debian/changelog b/debian/changelog
index c15cc91..080280f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ dose3 (2.9.3-1) experimental; urgency=low
     been rewritten from scratch.
   * Standards-Version 3.9.2 (no change)
   * debian/control: remove redundant Section entry for libdose3-ocaml-dev.
+  * Drop patch manpages since fixed by upstream.
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 15 May 2011 18:40:58 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sun, 15 May 2011 18:49:43 +0200
 
 dose3 (2.9.2-1-1) UNRELEASED; urgency=low
   
diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos
index 6f41bef..bd227f9 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -2,20 +2,31 @@ Author: Ralf Treinen <treinen at debian.org>
 Description: In debian, the symlinks to distcheck for specific distribution
   formats are named dose3-*.
 
-Index: dose3/doc/manpages/distcheck.1
+Index: dose3/applications/distcheck.ml
 ===================================================================
---- dose3.orig/doc/manpages/distcheck.1	2011-03-03 17:37:16.000000000 +0100
-+++ dose3/doc/manpages/distcheck.1	2011-03-03 17:39:47.000000000 +0100
-@@ -1,18 +1,18 @@
--.TH distcheck 1 "December 3, 2010" "Version 2.9" "USER COMMANDS"
-+.TH dose3-distcheck 1 "December 3, 2010" "Version 2.9" "USER COMMANDS"
- .SH NAME
--distcheck \- check installability of packages according to metadata
-+dose3-distcheck \- check installability of packages according to metadata
- 
+--- dose3.orig/applications/distcheck.ml	2011-05-15 18:53:29.000000000 +0200
++++ dose3/applications/distcheck.ml	2011-05-15 18:54:36.000000000 +0200
+@@ -61,10 +61,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
+     |"eclipsecheck",l -> List.map ((^) "eclipse://") l
+-    |("rpmcheck"|"edos-rpmcheck"),l -> List.map ((^) "synth://") l
++    |("rpmcheck"|"dose3-rpmcheck"),l -> List.map ((^) "synth://") l
+     |_,_ -> args
+   in
+   Boilerplate.enable_debug (OptParse.Opt.get Options.verbose);
+Index: dose3/doc/manpages/distcheck.1.in
+===================================================================
+--- dose3.orig/doc/manpages/distcheck.1.in	2011-05-15 18:54:44.000000000 +0200
++++ dose3/doc/manpages/distcheck.1.in	2011-05-15 18:58:24.000000000 +0200
+@@ -5,11 +5,11 @@
  .SH SYNOPSIS
--\fBdistcheck\fR [option] ... \fIuri\fR
-+\fBdose3-distcheck\fR [option] ... \fIuri\fR
+ \fBdistcheck\fR [option] ... \fIuri\fR
  .br
 -\fBdebcheck\fR [option] ... \fIfile\fR
 +\fBdose3-debcheck\fR [option] ... \fIfile\fR
@@ -27,26 +38,9 @@ Index: dose3/doc/manpages/distcheck.1
 +\fBdose3-eclipsecheck\fR [option] ... \fIfile\fR
  
  .SH DESCRIPTION
--.B distcheck
-+.B dose3-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
-@@ -29,7 +29,7 @@
- 
- .SH INPUT SPECIFICATION
- Currently supported repository types are debian, rpm, and eclipse. The
--.B distcheck
-+.B dose3-distcheck
- tool expects its input specifiation in the form
- .I type://pathname
- where
-@@ -41,10 +41,10 @@
- .I type
- given in the URI.
- 
--When invoked as \fItype\fBcheck\fR, the type of the repository is
-+When invoked as \fBdose3-\fItype\fBcheck\fR, the type of the repository is
+ .B distcheck
+@@ -44,7 +44,7 @@
+ 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
@@ -63,42 +57,21 @@ Index: dose3/doc/manpages/distcheck.1
  .P
  Installability of packages is analyzed according to their
  \fBDepends\fR, \fBConflicts\fR, and \fBProvides\fR fields with their
-@@ -70,8 +70,8 @@
+@@ -70,7 +70,7 @@
  
  .SS RPM
  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
 +file.  By default dose3-rpmcheck expects a synthesis file as input. To
-+specify a hdlist file dose3-distcheck must be invoked with a file argument
+ specify a hdlist file distcheck must be invoked with a file argument
  of the form hdlist://
  
- .SS Eclipse
-@@ -121,7 +121,7 @@
- found in the directory \fB/var/lib/apt/lists\fR.
+@@ -115,7 +115,7 @@
+ .SH EXAMPLE
+ Check which packages in a particular distribution are not installable and why:
  
- .SH NOTE
--distcheck is a complete reimplementation of edos-debcheck, written for the
-+dose3-distcheck is a complete reimplementation of edos-debcheck, written for the
- EDOS project.
+-  debcheck \-\-failures \-\-explain < Packages
++  dose3-debcheck \-\-failures \-\-explain < Packages
  
- .SH AUTHOR
-Index: dose3/applications/distcheck.ml
-===================================================================
---- dose3.orig/applications/distcheck.ml	2011-03-03 17:40:03.000000000 +0100
-+++ dose3/applications/distcheck.ml	2011-03-03 17:41:11.000000000 +0100
-@@ -61,10 +61,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
--    |"eclipsecheck",l -> List.map ((^) "eclipse://") l
--    |("rpmcheck"|"edos-rpmcheck"),l -> List.map ((^) "synthesis://") l
-+    |("debcheck"|"dose3-debcheck"),[] -> ["deb://-"]
-+    |("debcheck"|"dose3-debcheck"),l -> List.map ((^) "deb://") l
-+    |("eclipsecheck"|"dose3-eclipsecheck"),l -> List.map ((^) "eclipse://") l
-+    |("rpmcheck"|"dose3-rpmcheck"),l -> List.map ((^) "synthesis://") l
-     |_,_ -> args
-   in
-   Boilerplate.enable_debug (OptParse.Opt.get Options.verbose);
+ where Packages is the file pertaining to that distribution, as for instance
+ found in the directory \fB/var/lib/apt/lists\fR.
diff --git a/debian/patches/manpages b/debian/patches/manpages
deleted file mode 100644
index 6163652..0000000
--- a/debian/patches/manpages
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: dose3/doc/manpages/ceve.1
-===================================================================
---- dose3.orig/doc/manpages/ceve.1	2011-03-03 17:35:50.000000000 +0100
-+++ dose3/doc/manpages/ceve.1	2011-03-03 17:36:15.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH ceve 1 "November 11, 2010" "Version 3.0" "USER COMMANDS"
-+.TH ceve 1 "November 11, 2010" "Version 2.9" "USER COMMANDS"
- .SH NAME
- ceve \- parse package metadata
- .SH SYNOPSIS
diff --git a/debian/patches/series b/debian/patches/series
index f9640d4..9dceec7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-manpages
 binaries-prefix-edos

-- 
dose3 packaging

