[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-8-g1d84a87
Ralf Treinen
treinen at free.fr
Thu Mar 3 17:01:19 UTC 2011
The following commit has been merged in the master branch:
commit 93a78d794954d64545ba9c3d818117fccd28007d
Author: Ralf Treinen <treinen at free.fr>
Date: Thu Mar 3 17:47:21 2011 +0100
refresh patches for 2.9.1
diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos
index 4c60b68..6f41bef 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -2,30 +2,10 @@ Author: Ralf Treinen <treinen at debian.org>
Description: In debian, the symlinks to distcheck for specific distribution
formats are named dose3-*.
-
-Index: dose3/applications/distcheck.ml
-===================================================================
---- dose3.orig/applications/distcheck.ml 2010-12-04 15:21:43.000000000 +0100
-+++ dose3/applications/distcheck.ml 2010-12-04 15:45:01.000000000 +0100
-@@ -58,10 +58,10 @@
- let posargs =
- let args = OptParse.OptParser.parse_argv Options.options in
- match Filename.basename(Sys.argv.(0)),args with
-- |"debcheck",[] -> ["deb://-"]
-- |"debcheck",l -> List.map ((^) "deb://") l
-- |"eclipsecheck",l -> List.map ((^) "eclipse://") l
-- |"rpmcheck",l -> List.map ((^) "synthesis://") l
-+ |"dose3-debcheck",[] -> ["deb://-"]
-+ |"dose3-debcheck",l -> List.map ((^) "deb://") l
-+ |"dose3-eclipsecheck",l -> List.map ((^) "eclipse://") l
-+ |"dose3-rpmcheck",l -> List.map ((^) "synthesis://") l
- |_,_ -> args
- in
- Boilerplate.enable_debug (OptParse.Opt.get Options.verbose);
Index: dose3/doc/manpages/distcheck.1
===================================================================
---- dose3.orig/doc/manpages/distcheck.1 2010-12-04 15:45:01.000000000 +0100
-+++ dose3/doc/manpages/distcheck.1 2010-12-04 15:46:43.000000000 +0100
+--- 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"
@@ -103,3 +83,22 @@ Index: dose3/doc/manpages/distcheck.1
EDOS project.
.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);
diff --git a/debian/patches/manpages b/debian/patches/manpages
index 1542ea6..6163652 100644
--- a/debian/patches/manpages
+++ b/debian/patches/manpages
@@ -1,87 +1,7 @@
-Index: dose3/doc/manpages/distcheck.1
-===================================================================
---- dose3.orig/doc/manpages/distcheck.1 2010-12-04 15:21:43.000000000 +0100
-+++ dose3/doc/manpages/distcheck.1 2010-12-04 15:32:20.000000000 +0100
-@@ -1,4 +1,4 @@
--.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
-
-@@ -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:
-@@ -132,4 +134,3 @@
-
- <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.
--
Index: dose3/doc/manpages/ceve.1
===================================================================
---- dose3.orig/doc/manpages/ceve.1 2010-12-04 15:32:30.000000000 +0100
-+++ dose3/doc/manpages/ceve.1 2010-12-04 15:32:54.000000000 +0100
+--- 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"
--
dose3 packaging
More information about the Pkg-ocaml-maint-commits
mailing list