[Pkg-ocaml-maint-commits] [oasis] 01/03: Put patches in dom-{save, apply}-patches format
Stéphane Glondu
glondu at moszumanska.debian.org
Sun Dec 8 10:11:57 UTC 2013
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository oasis.
commit c874d969ad046223c0def4482514f019df6f8c97
Author: Stephane Glondu <steph at glondu.net>
Date: Sun Dec 8 10:51:43 2013 +0100
Put patches in dom-{save,apply}-patches format
---
...t-set-timeout-to-avoid-error-on-slow-arch.patch | 22 ++++++++++++
...-spelling.patch => 0002-lintian-spelling.patch} | 40 ++++++++++++++--------
.../0003-fix-ocamlbuild-plugin-export.patch | 22 ++++++++++++
debian/patches/0004-fix-ocamlbuild-deps.patch | 23 +++++++++++++
debian/patches/0005-fixperms-debian-rules.patch | 18 ++++++++++
...atch => 0006-require-ocamlbuild-for-test.patch} | 15 ++++++--
... => 0007-fix-testsuite-on-bytecode-archs.patch} | 13 ++++++-
debian/patches/debian-changes-0.2.0-4 | 13 -------
debian/patches/fix-ocamlbuild-deps.patch | 13 -------
debian/patches/fix-ocamlbuild-plugin-export.patch | 13 -------
debian/patches/fixperms-debian-rules.patch | 9 -----
debian/patches/series | 14 ++++----
12 files changed, 142 insertions(+), 73 deletions(-)
diff --git a/debian/patches/0001-Don-t-set-timeout-to-avoid-error-on-slow-arch.patch b/debian/patches/0001-Don-t-set-timeout-to-avoid-error-on-slow-arch.patch
new file mode 100644
index 0000000..5508781
--- /dev/null
+++ b/debian/patches/0001-Don-t-set-timeout-to-avoid-error-on-slow-arch.patch
@@ -0,0 +1,22 @@
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Sun, 8 Dec 2013 10:48:32 +0100
+Subject: Don't set timeout to avoid error on slow arch
+
+---
+ test/TestQuickstart.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/TestQuickstart.ml b/test/TestQuickstart.ml
+index 8c3defa..31dba9f 100644
+--- a/test/TestQuickstart.ml
++++ b/test/TestQuickstart.ml
+@@ -74,7 +74,7 @@ let tests =
+ try
+ with_spawn
+ ~verbose:!dbug
+- ~timeout:(Some 0.1)
++ ~timeout:None
+ (oasis ())
+ (Array.of_list args)
+ (fun t () -> f t)
+--
diff --git a/debian/patches/lintian-spelling.patch b/debian/patches/0002-lintian-spelling.patch
similarity index 58%
rename from debian/patches/lintian-spelling.patch
rename to debian/patches/0002-lintian-spelling.patch
index 79e767e..b4497c7 100644
--- a/debian/patches/lintian-spelling.patch
+++ b/debian/patches/0002-lintian-spelling.patch
@@ -1,19 +1,17 @@
-Description: fix lintian spelling errors
-Author: Hendrik Tews <hendrik at askra.de>
---- a/src/oasis/OASISRecDescParser.ml
-+++ b/src/oasis/OASISRecDescParser.ml
-@@ -625,7 +625,7 @@
- parse_expr (lexer (Stream.of_string str))
- with e ->
- failwithf
-- (f_ "Error when parsing expresion '%s' %t: %s")
-+ (f_ "Error when parsing expression '%s' %t: %s")
- str
- position
- (Printexc.to_string e)
+From: Hendrik Tews <hendrik at askra.de>
+Date: Sun, 8 Dec 2013 10:48:42 +0100
+Subject: lintian-spelling
+
+---
+ src/oasis/MANUAL-template.mkd | 2 +-
+ src/oasis/OASISRecDescParser.ml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/oasis/MANUAL-template.mkd b/src/oasis/MANUAL-template.mkd
+index 07f0d40..b97ddf3 100644
--- a/src/oasis/MANUAL-template.mkd
+++ b/src/oasis/MANUAL-template.mkd
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ $ListOASISTestFields
### SourceRepository
@@ -22,3 +20,17 @@ Author: Hendrik Tews <hendrik at askra.de>
* head: identify the main development repository.
* this: identify the repository at the state of the current version.
+diff --git a/src/oasis/OASISRecDescParser.ml b/src/oasis/OASISRecDescParser.ml
+index c0e00dd..f2b5cbe 100644
+--- a/src/oasis/OASISRecDescParser.ml
++++ b/src/oasis/OASISRecDescParser.ml
+@@ -625,7 +625,7 @@ let parse_stream conf st =
+ parse_expr (lexer (Stream.of_string str))
+ with e ->
+ failwithf
+- (f_ "Error when parsing expresion '%s' %t: %s")
++ (f_ "Error when parsing expression '%s' %t: %s")
+ str
+ position
+ (Printexc.to_string e)
+--
diff --git a/debian/patches/0003-fix-ocamlbuild-plugin-export.patch b/debian/patches/0003-fix-ocamlbuild-plugin-export.patch
new file mode 100644
index 0000000..c710d1d
--- /dev/null
+++ b/debian/patches/0003-fix-ocamlbuild-plugin-export.patch
@@ -0,0 +1,22 @@
+From: Hendrik Tews <hendrik at askra.de>
+Date: Sun, 8 Dec 2013 10:49:06 +0100
+Subject: fix-ocamlbuild-plugin-export
+
+---
+ _tags | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/_tags b/_tags
+index 0f1cf16..74d8daa 100644
+--- a/_tags
++++ b/_tags
+@@ -209,8 +209,6 @@
+ <src/cli/Main.byte>: -use_base
+ <src/cli/Main.byte>: -use_oasis
+
+-<src/builtin-plugins.cma>: use_ocamlbuild
+-
+ <**/*.ml>: annot
+
+ "build": -traverse
+--
diff --git a/debian/patches/0004-fix-ocamlbuild-deps.patch b/debian/patches/0004-fix-ocamlbuild-deps.patch
new file mode 100644
index 0000000..7ed3467
--- /dev/null
+++ b/debian/patches/0004-fix-ocamlbuild-deps.patch
@@ -0,0 +1,23 @@
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Sun, 8 Dec 2013 10:49:17 +0100
+Subject: fix-ocamlbuild-deps
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711452
+---
+ src/oasis/META | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/oasis/META b/src/oasis/META
+index 0a89243..671a25b 100644
+--- a/src/oasis/META
++++ b/src/oasis/META
+@@ -52,7 +52,7 @@ package "cli" (
+ package "builtin-plugins" (
+ version = "0.3.0"
+ description = "_oasis file functions"
+- requires = "oasis oasis.base"
++ requires = "oasis oasis.base ocamlbuild"
+ archive(byte) = "builtin-plugins.cma"
+ archive(byte, plugin) = "builtin-plugins.cma"
+ archive(native) = "builtin-plugins.cmxa"
+--
diff --git a/debian/patches/0005-fixperms-debian-rules.patch b/debian/patches/0005-fixperms-debian-rules.patch
new file mode 100644
index 0000000..032d742
--- /dev/null
+++ b/debian/patches/0005-fixperms-debian-rules.patch
@@ -0,0 +1,18 @@
+From: Hendrik Tews <hendrik at askra.de>
+Date: Sun, 8 Dec 2013 10:49:30 +0100
+Subject: fixperms-debian-rules
+
+---
+ _fixperms | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/_fixperms b/_fixperms
+index 0792e92..4960e9c 100644
+--- a/_fixperms
++++ b/_fixperms
+@@ -8,3 +8,4 @@ test/data/bug982/test-setup-data.sh
+ test/data/bug823/postconf.sh
+ test/data/bug823/preconf.sh
+ test/data/bug938/postconf.sh
++debian/rules
+--
diff --git a/debian/patches/require-ocamlbuild-for-test.patch b/debian/patches/0006-require-ocamlbuild-for-test.patch
similarity index 59%
rename from debian/patches/require-ocamlbuild-for-test.patch
rename to debian/patches/0006-require-ocamlbuild-for-test.patch
index dcfb5b1..72d59d6 100644
--- a/debian/patches/require-ocamlbuild-for-test.patch
+++ b/debian/patches/0006-require-ocamlbuild-for-test.patch
@@ -1,8 +1,16 @@
-Description: fix test OASIS:5:TestFull:28:setup
-Author: Hendrik Tews <hendrik at askra.de>
+From: Hendrik Tews <hendrik at askra.de>
+Date: Sun, 8 Dec 2013 10:49:48 +0100
+Subject: require-ocamlbuild-for-test
+
+---
+ test/TestFull.ml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/TestFull.ml b/test/TestFull.ml
+index c1aea1b..7cb6e9e 100644
--- a/test/TestFull.ml
+++ b/test/TestFull.ml
-@@ -712,6 +712,7 @@
+@@ -712,6 +712,7 @@ let tests =
List.rev_append
("#require \"unix\";;" ::
"#require \"odn\";;" ::
@@ -10,3 +18,4 @@ Author: Hendrik Tews <hendrik at askra.de>
(List.map mkload
[["oasis"; "oasis.cma"];
["base"; "base.cma"];
+--
diff --git a/debian/patches/fix-testsuite-on-bytecode-archs.patch b/debian/patches/0007-fix-testsuite-on-bytecode-archs.patch
similarity index 53%
rename from debian/patches/fix-testsuite-on-bytecode-archs.patch
rename to debian/patches/0007-fix-testsuite-on-bytecode-archs.patch
index 35ad755..9443d97 100644
--- a/debian/patches/fix-testsuite-on-bytecode-archs.patch
+++ b/debian/patches/0007-fix-testsuite-on-bytecode-archs.patch
@@ -1,6 +1,16 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 8 Dec 2013 10:50:11 +0100
+Subject: fix-testsuite-on-bytecode-archs
+
+---
+ test/TestFull.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/TestFull.ml b/test/TestFull.ml
+index 7cb6e9e..8233fe5 100644
--- a/test/TestFull.ml
+++ b/test/TestFull.ml
-@@ -568,7 +568,7 @@
+@@ -568,7 +568,7 @@ let tests =
else
fn
in
@@ -9,3 +19,4 @@
(* stubs library *)
fn :: acc
else if !has_ocamlopt then
+--
diff --git a/debian/patches/debian-changes-0.2.0-4 b/debian/patches/debian-changes-0.2.0-4
deleted file mode 100644
index 69d713e..0000000
--- a/debian/patches/debian-changes-0.2.0-4
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Don't set timeout to avoid error on slow arch
-Author: Sylvain Le Gall <gildor at debian.org>
---- a/test/TestQuickstart.ml
-+++ b/test/TestQuickstart.ml
-@@ -74,7 +74,7 @@
- try
- with_spawn
- ~verbose:!dbug
-- ~timeout:(Some 0.1)
-+ ~timeout:None
- (oasis ())
- (Array.of_list args)
- (fun t () -> f t)
diff --git a/debian/patches/fix-ocamlbuild-deps.patch b/debian/patches/fix-ocamlbuild-deps.patch
deleted file mode 100644
index be5ddc5..0000000
--- a/debian/patches/fix-ocamlbuild-deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: fix for #711452
-Author: Sylvain Le Gall <gildor at debian.org>
---- a/src/oasis/META
-+++ b/src/oasis/META
-@@ -52,7 +52,7 @@
- package "builtin-plugins" (
- version = "0.3.0"
- description = "_oasis file functions"
-- requires = "oasis oasis.base"
-+ requires = "oasis oasis.base ocamlbuild"
- archive(byte) = "builtin-plugins.cma"
- archive(byte, plugin) = "builtin-plugins.cma"
- archive(native) = "builtin-plugins.cmxa"
diff --git a/debian/patches/fix-ocamlbuild-plugin-export.patch b/debian/patches/fix-ocamlbuild-plugin-export.patch
deleted file mode 100644
index 6556ed2..0000000
--- a/debian/patches/fix-ocamlbuild-plugin-export.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: fix the Ocamlbuild_plugin export problem
-Author: Hendrik Tews <hendrik at askra.de>
---- a/_tags
-+++ b/_tags
-@@ -209,8 +209,6 @@
- <src/cli/Main.byte>: -use_base
- <src/cli/Main.byte>: -use_oasis
-
--<src/builtin-plugins.cma>: use_ocamlbuild
--
- <**/*.ml>: annot
-
- "build": -traverse
diff --git a/debian/patches/fixperms-debian-rules.patch b/debian/patches/fixperms-debian-rules.patch
deleted file mode 100644
index d6eadaa..0000000
--- a/debian/patches/fixperms-debian-rules.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Description: include debian/rules in _fixperms for tests
-Author: Hendrik Tews <hendrik at askra.de>
---- a/_fixperms
-+++ b/_fixperms
-@@ -8,3 +8,4 @@
- test/data/bug823/postconf.sh
- test/data/bug823/preconf.sh
- test/data/bug938/postconf.sh
-+debian/rules
diff --git a/debian/patches/series b/debian/patches/series
index 31b722a..96d250f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
-debian-changes-0.2.0-4
-lintian-spelling.patch
-fix-ocamlbuild-plugin-export.patch
-fix-ocamlbuild-deps.patch
-fixperms-debian-rules.patch
-require-ocamlbuild-for-test.patch
-fix-testsuite-on-bytecode-archs.patch
+0001-Don-t-set-timeout-to-avoid-error-on-slow-arch.patch
+0002-lintian-spelling.patch
+0003-fix-ocamlbuild-plugin-export.patch
+0004-fix-ocamlbuild-deps.patch
+0005-fixperms-debian-rules.patch
+0006-require-ocamlbuild-for-test.patch
+0007-fix-testsuite-on-bytecode-archs.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.git
More information about the Pkg-ocaml-maint-commits
mailing list