The following commit has been merged in the master branch:
commit 2a188896fd42f328502cedf94fd3d1e1571170bd
Author: Sylvain Le Gall <gil...@debian.org>
Date: Tue Jun 28 16:23:21 2011 +0000
Don't set timeout to avoid error on slow arch
diff --git a/debian/changelog b/debian/changelog
index e0349ef..1f95f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+oasis (0.2.0-4) UNRELEASED; urgency=low
+
+ * Don't set timeout to avoid error on slow arch
+
+ -- Sylvain Le Gall <gil...@debian.org> Tue, 28 Jun 2011 16:16:04 +0000
+
oasis (0.2.0-3) unstable; urgency=low
* Team upload
diff --git a/debian/patches/debian-changes-0.2.0-1
b/debian/patches/debian-changes-0.2.0-4
similarity index 65%
copy from debian/patches/debian-changes-0.2.0-1
copy to debian/patches/debian-changes-0.2.0-4
index 41b4c1e..c3ab173 100644
--- a/debian/patches/debian-changes-0.2.0-1
+++ b/debian/patches/debian-changes-0.2.0-4
@@ -1,15 +1,14 @@
-Description: Upstream changes introduced in version 0.2.0-1
+Description: Upstream changes introduced in version 0.2.0-4
This patch has been created by dpkg-source during the package build.
Here's the last changelog entry, hopefully it gives details on why
those changes were made:
.
- oasis (0.2.0-1) unstable; urgency=low
+ oasis (0.2.0-4) UNRELEASED; urgency=low
.
- * Initial release. (Closes: #603830)
+ * Don't set timeout to avoid error on slow arch
.
The person named in the Author field signed this changelog entry.
Author: Sylvain Le Gall <gil...@debian.org>
-Bug-Debian: http://bugs.debian.org/603830
---
The information above should follow the Patch Tagging Guidelines, please
@@ -24,11 +23,14 @@ Forwarded: <no|not-needed|url proving that it has been
forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- oasis-0.2.0.orig/_tags
-+++ oasis-0.2.0/_tags
-@@ -218,4 +218,4 @@
- <src/cli/Main.byte>: -use_base
- <src/cli/Main.byte>: -use_oasis
-
--<src/builtin-plugins.cma>: use_ocamlbuild
-+#<src/builtin-plugins.cma>: use_ocamlbuild
+--- oasis-0.2.0.orig/test/TestQuickstart.ml
++++ oasis-0.2.0/test/TestQuickstart.ml
+@@ -47,7 +47,7 @@ let tests =
+ try
+ with_spawn
+ ~verbose:!dbug
+- ~timeout:(Some 0.1)
++ ~timeout:None
+ (oasis ())
+ (Array.of_list args)
+ (fun t () ->
diff --git a/debian/patches/series b/debian/patches/series
index 4656b53..e4f8508 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
debian-changes-0.2.0-1
+debian-changes-0.2.0-4
--
oasis packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
