The following commit has been merged in the master branch:
commit b3f46044a6e508d93f901806f3f536536b54df41
Author: Ralf Treinen <[email protected]>
Date: Mon May 24 21:05:31 2010 +0200
fix a bug with option handling
diff --git a/debian/changelog b/debian/changelog
index 73595e0..1047661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pkglab (1.4.2-11) unstable; urgency=low
+
+ * Fix a bug in the handling of the options -base and -add-source
+ reported by Andi Barth.
+ * Removed Zack from uploaders on his request.
+
+ -- Ralf Treinen <[email protected]> Mon, 24 May 2010 21:04:59 +0200
+
pkglab (1.4.2-10) experimental; urgency=low
* Fix logic in add-sources.py (used by edos-builddebcheck): If one of
diff --git a/debian/control b/debian/control
index 94aac2a..521958c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <[email protected]>
Uploaders:
- Stefano Zacchiroli <[email protected]>,
Ralf Treinen <[email protected]>,
Stéphane Glondu <[email protected]>
Build-Depends:
diff --git a/distcheck/common.ml b/distcheck/common.ml
index 17c9dbd..af7c9b1 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 FILE", String (add_source false), "Additional binary package
control file providing packages that are not checked but used for resolving
dependencies");
- ("-add-source FILE", String (add_source true), "Additional binary
package control file providing packages that ARE checked and used for resolving
dependencies");
+ ("-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");
("-checkonly",
String (fun s -> units_to_check := Util.split_at ',' s;
units_to_check_set := true),
"Check only these packages");
--
pkglab packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
