[Pkg-ocaml-maint-commits] [oasis] 03/03: Imported Upstream version 0.4.2.
Sylvain LE GALL
gildor at moszumanska.debian.org
Wed Mar 5 23:36:07 UTC 2014
This is an automated email from the git hooks/post-receive script.
gildor pushed a commit to branch master
in repository oasis.
commit 7cda0386f9a372ef38561c76dc9a02c5cae7afb4
Author: Sylvain Le Gall <gildor at debian.org>
Date: Wed Mar 5 23:35:56 2014 +0000
Imported Upstream version 0.4.2.
* Imported Upstream version 0.4.2.
* Remove most of the patches, they have been applied upstream.
---
debian/changelog | 7 +++++
debian/control | 24 +++++++--------
...t-set-timeout-to-avoid-error-on-slow-arch.patch | 19 ++++++------
debian/patches/0002-lintian-spelling.patch | 36 ----------------------
.../0003-fix-ocamlbuild-plugin-export.patch | 22 -------------
debian/patches/0004-fix-ocamlbuild-deps.patch | 23 --------------
debian/patches/0005-fixperms-debian-rules.patch | 18 -----------
.../patches/0006-require-ocamlbuild-for-test.patch | 21 -------------
.../0007-fix-testsuite-on-bytecode-archs.patch | 22 -------------
...008-Update-ocamldoc-test-for-OCaml-4.01.0.patch | 23 --------------
debian/patches/series | 7 -----
11 files changed, 27 insertions(+), 195 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5f28543..e9b4da0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+oasis (0.4.2-1) UNRELEASED; urgency=low
+
+ * Imported Upstream version 0.4.2.
+ * Remove most of the patches, they have been applied upstream.
+
+ -- Sylvain Le Gall <sylvain at le-gall.net> Thu, 27 Feb 2014 22:12:18 +0100
+
oasis (0.3.0-4) unstable; urgency=low
* Team upload
diff --git a/debian/control b/debian/control
index 7847634..b125fb6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,23 @@ Source: oasis
Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders:
+Uploaders:
Sylvain Le Gall <gildor at debian.org>,
Hendrik Tews <hendrik at askra.de>
Build-Depends:
debhelper (>= 9),
dh-ocaml (>= 0.9~),
- ocaml-nox (>= 3.11.1-3~),
+ ocaml-nox (>= 3.11.2),
ocaml-best-compilers,
- ocaml-findlib,
+ ocaml-findlib (>= 1.3.1),
ocamlify,
- ocamlmod,
+ ocamlmod (>= 0.0.7),
libpcre-ocaml-dev,
- libounit-ocaml-dev (>= 1.1.0),
- libodn-ocaml-dev (>= 0.0.3),
- libocamlgraph-ocaml-dev,
+ libounit-ocaml-dev (>= 2.0.0),
+ libodn-ocaml-dev (>= 0.0.11),
libfindlib-ocaml-dev,
- libfileutils-ocaml-dev,
- libextlib-ocaml-dev,
- libexpect-ocaml-dev (>= 0.0.2),
+ libfileutils-ocaml-dev (>= 0.4.2),
+ libexpect-ocaml-dev (>= 0.0.4),
zlib1g-dev,
libidn11-dev,
libbitstring-ocaml-dev
@@ -63,8 +61,8 @@ Description: Build-system generation for OCaml projects -- binaries
Package: liboasis-ocaml-dev
Architecture: any
Suggests: liboasis-ocaml-doc
-Depends:
- ${ocaml:Depends},
+Depends:
+ ${ocaml:Depends},
${shlibs:Depends},
${misc:Depends}
Provides: ${ocaml:Provides}
@@ -97,7 +95,7 @@ Package: liboasis-ocaml
Architecture: any
Suggests: liboasis-ocaml-doc
Depends:
- ${ocaml:Depends},
+ ${ocaml:Depends},
${shlibs:Depends},
${misc:Depends}
Provides: ${ocaml:Provides}
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
index 5508781..d161fa9 100644
--- 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
@@ -6,17 +6,16 @@ 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
+Index: oasis/test/TestQuickstart.ml
+===================================================================
+--- oasis.orig/test/TestQuickstart.ml 2014-03-05 00:27:21.194430548 +0000
++++ oasis/test/TestQuickstart.ml 2014-03-05 00:27:39.078445104 +0000
+@@ -70,7 +70,7 @@
with_spawn
- ~verbose:!dbug
+ ~verbose:true
+ ~verbose_output:(logf test_ctxt `Info "expect: %s")
- ~timeout:(Some 0.1)
+ ~timeout:None
- (oasis ())
+ (oasis_exec test_ctxt)
(Array.of_list args)
- (fun t () -> f t)
---
+ (fun t () -> f t)
diff --git a/debian/patches/0002-lintian-spelling.patch b/debian/patches/0002-lintian-spelling.patch
deleted file mode 100644
index b4497c7..0000000
--- a/debian/patches/0002-lintian-spelling.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 @@ $ListOASISTestFields
-
- ### SourceRepository
-
--Define VCS informations. There is two special identified repository:
-+Define VCS information. There are two special identified repositories:
-
- * 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
deleted file mode 100644
index c710d1d..0000000
--- a/debian/patches/0003-fix-ocamlbuild-plugin-export.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 7ed3467..0000000
--- a/debian/patches/0004-fix-ocamlbuild-deps.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 032d742..0000000
--- a/debian/patches/0005-fixperms-debian-rules.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/0006-require-ocamlbuild-for-test.patch b/debian/patches/0006-require-ocamlbuild-for-test.patch
deleted file mode 100644
index 72d59d6..0000000
--- a/debian/patches/0006-require-ocamlbuild-for-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 @@ let tests =
- List.rev_append
- ("#require \"unix\";;" ::
- "#require \"odn\";;" ::
-+ "#require \"ocamlbuild\";;" ::
- (List.map mkload
- [["oasis"; "oasis.cma"];
- ["base"; "base.cma"];
---
diff --git a/debian/patches/0007-fix-testsuite-on-bytecode-archs.patch b/debian/patches/0007-fix-testsuite-on-bytecode-archs.patch
deleted file mode 100644
index 9443d97..0000000
--- a/debian/patches/0007-fix-testsuite-on-bytecode-archs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 @@ let tests =
- else
- fn
- in
-- if OASISString.starts_with (Filename.basename fn) "lib" then
-+ if OASISString.starts_with ~what:"lib" (Filename.basename fn) then
- (* stubs library *)
- fn :: acc
- else if !has_ocamlopt then
---
diff --git a/debian/patches/0008-Update-ocamldoc-test-for-OCaml-4.01.0.patch b/debian/patches/0008-Update-ocamldoc-test-for-OCaml-4.01.0.patch
deleted file mode 100644
index 1c0a497..0000000
--- a/debian/patches/0008-Update-ocamldoc-test-for-OCaml-4.01.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sun, 8 Dec 2013 10:57:42 +0100
-Subject: Update ocamldoc test for OCaml 4.01.0
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731636
----
- test/TestFull.ml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/test/TestFull.ml b/test/TestFull.ml
-index 8233fe5..89bc29b 100644
---- a/test/TestFull.ml
-+++ b/test/TestFull.ml
-@@ -1224,8 +1224,6 @@ let tests =
-
- api_ref_html "with-c"
- ["A"];
-- in_html "with-c"
-- ["code_VALA.ident.html"];
- ],
- (if !has_ocamlopt then
- (fun lst ->
---
diff --git a/debian/patches/series b/debian/patches/series
index 5ba9f30..ecc7a32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1 @@
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
-0008-Update-ocamldoc-test-for-OCaml-4.01.0.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