[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.2-10-4-gb7be026

[Ralf Treinen]

The following commit has been merged in the master branch:
commit f320d84680fc69cf501997189398ce91abf022af
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon May 24 21:30:18 2010 +0200

    use "-i and "-I" for the two file input options

diff --git a/debian/edos-distcheck.NEWS b/debian/edos-distcheck.NEWS
index 298b761..8fa1e6c 100644
--- a/debian/edos-distcheck.NEWS
+++ b/debian/edos-distcheck.NEWS
@@ -15,4 +15,3 @@ pkglab (1.4.2-1) unstable; urgency=low
     edos-debcheck -checkonly xemacs21,debhelper < Packages
 
  -- Ralf Treinen <treinen at debian.org>  Mon, 15 Jun 2009 21:20:42 +0200
-
diff --git a/debian/manpages/edos-debcheck.1 b/debian/manpages/edos-debcheck.1
index 9e03519..7c179a7 100644
--- a/debian/manpages/edos-debcheck.1
+++ b/debian/manpages/edos-debcheck.1
@@ -43,6 +43,15 @@ actually in Debian.
 
 .SH OPTIONS
 .TP
+.B -i \fIfile\fR
+Specify an additional input file containing stanzas in deb-control(5) format.
+These packages are checked for installability the same way as packages read
+from standard input.
+.TP
+.B -I \fIfile\fR
+Specify an additional input file containing stanzas in deb-control(5) format.
+These packages that are not checked for installability but only used for resolving dependencies.
+.TP
 .B \-explain
 Explain the results
 .TP
diff --git a/distcheck/common.ml b/distcheck/common.ml
index af7c9b1..186610a 100644
--- a/distcheck/common.ml
+++ b/distcheck/common.ml
@@ -262,8 +262,8 @@ let speclist = ref [
 	("-explain", Set explain_results, "Explain the results");
 	("-failures", Clear show_successes, "Only show failures");
 	("-successes", Clear show_failures, "Only show successes");
-	("-base", String (add_source false), "Additional binary package control file providing packages that are not checked but used for resolving dependencies");
-	("-add-source", String (add_source true), "Additional binary package control file providing packages that ARE checked and used for resolving dependencies");
+	("-i", String (add_source true), "Additional binary package control file providing packages that are checked and used for resolving dependencies");
+	("-I", String (add_source false), "Additional binary package control file providing packages that are NOT checked but used only for resolving dependencies");
 	("-checkonly", 
 	  String (fun s -> units_to_check := Util.split_at ',' s; units_to_check_set := true),
 	  "Check only these packages");

-- 
pkglab packaging