[Pkg-ocaml-maint-commits] [SCM] oasis packaging branch, master, updated. debian/0.3.0-1-5-g9d9e871

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 9d9e87109a540fa0bdc875516e6b0975feea68c0
Author: Hendrik Tews <hendrik at askra.de>
Date:   Mon Jun 24 10:52:18 2013 +0200

    fix last test error and #711451
    
    - fix last test error
    - more build-depends for skipped tests
    - undo earlier fix for #711451 and fix it again with dependencies

diff --git a/debian/changelog b/debian/changelog
index b7fd75b..2264093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,16 @@
-oasis (0.3.0-2) UNRELEASED; urgency=low
+oasis (0.3.0-2) unstable; urgency=low
 
-  * silent lintian canonical vcs info
+  * update Vcs fields
   * add patch from Sylvain (Closes: #711452)
-  * move cmi and ml* files from dir /usr/lib/ocaml/oasis into the runtime
-    package lioasis-ocaml (Closes: #711451)
   * enable tests (add patch fixperms-debian-rules to fix premature errors)
   * cp OASISData.mli with proper test
   * add build-dep zlib1g-dev for tests
+  * add liboasis-ocaml-dev dependency to oasis (Closes: #711451)
+  * add patch require-ocamlbuild-for-test for fixing test
+    OASIS:5:TestFull:28:setup
+  * build-depend on libidn11-dev and libbitstring-ocaml-dev to enable more tests
 
- -- Hendrik Tews <hendrik at askra.de>  Thu, 13 Jun 2013 14:40:26 +0200
+ -- Hendrik Tews <hendrik at askra.de>  Mon, 24 Jun 2013 10:33:04 +0200
 
 oasis (0.3.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d611d45..7847634 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ 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-best-compilers,
   ocaml-findlib,
@@ -20,8 +22,8 @@ Build-Depends:
   libextlib-ocaml-dev,
   libexpect-ocaml-dev (>= 0.0.2),
   zlib1g-dev,
-  dh-ocaml (>= 0.9~),
-  debhelper (>= 9)
+  libidn11-dev,
+  libbitstring-ocaml-dev
 Standards-Version: 3.9.4
 Homepage: http://oasis.forge.ocamlcore.org/
 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/oasis.git
@@ -32,7 +34,9 @@ Architecture: any
 Suggests: liboasis-ocaml-doc
 Depends:
  ${ocaml:Depends},
- ${misc:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends},
+ liboasis-ocaml-dev
 Description: Build-system generation for OCaml projects -- binaries
  OASIS generates a full configure, build and install system for your
  application. It starts with a simple `_oasis` file at the toplevel of your
diff --git a/debian/liboasis-ocaml-dev.install.in b/debian/liboasis-ocaml-dev.install.in
index 87d383a..962404b 100644
--- a/debian/liboasis-ocaml-dev.install.in
+++ b/debian/liboasis-ocaml-dev.install.in
@@ -1,4 +1,5 @@
- at OCamlStdlibDir@/oasis/*.cmx
+ at OCamlStdlibDir@/oasis/*.cm[ix]
+ at OCamlStdlibDir@/oasis/*.ml*
 OPT: @OCamlStdlibDir@/oasis/*.cmxa
 OPT: @OCamlStdlibDir@/oasis/*.a
 @OCamlStdlibDir@/plugin-loader/*.cm[ix]
diff --git a/debian/liboasis-ocaml.install.in b/debian/liboasis-ocaml.install.in
index 7249654..a82f46d 100644
--- a/debian/liboasis-ocaml.install.in
+++ b/debian/liboasis-ocaml.install.in
@@ -1,6 +1,5 @@
 @OCamlStdlibDir@/oasis/META
- at OCamlStdlibDir@/oasis/*.ml*
- at OCamlStdlibDir@/oasis/*.cm[iao]
+ at OCamlStdlibDir@/oasis/*.cm[ao]
 DYN: @OCamlStdlibDir@/oasis/*.cmxs
 @OCamlStdlibDir@/plugin-loader/META
 @OCamlStdlibDir@/plugin-loader/*.cm[ao]
diff --git a/debian/patches/require-ocamlbuild-for-test.patch b/debian/patches/require-ocamlbuild-for-test.patch
new file mode 100644
index 0000000..dcfb5b1
--- /dev/null
+++ b/debian/patches/require-ocamlbuild-for-test.patch
@@ -0,0 +1,12 @@
+Description: fix test OASIS:5:TestFull:28:setup
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/test/TestFull.ml
++++ b/test/TestFull.ml
+@@ -712,6 +712,7 @@
+                            List.rev_append
+                              ("#require \"unix\";;" ::
+                               "#require \"odn\";;" ::
++                              "#require \"ocamlbuild\";;" ::
+                               (List.map mkload
+                                  [["oasis"; "oasis.cma"];
+                                   ["base"; "base.cma"];
diff --git a/debian/patches/series b/debian/patches/series
index ce3b398..72594f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ lintian-spelling.patch
 fix-ocamlbuild-plugin-export.patch
 fix-ocamlbuild-deps.patch
 fixperms-debian-rules.patch
+require-ocamlbuild-for-test.patch

-- 
oasis packaging