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

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 40a3ba0bdb39b93711a8d69b0b0347b8efe35b2d
Author: Hendrik Tews <hendrik at askra.de>
Date:   Fri Jun 7 15:03:35 2013 +0200

    fixes for #711451 and #711452 and enable tests

diff --git a/debian/changelog b/debian/changelog
index 2f45b0c..057f7b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-oasis (0.3.0-2) unstable; urgency=low
+oasis (0.3.0-2) UNRELEASED; urgency=low
 
   * silent lintian canonical vcs info
+  * 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)
 
- -- Hendrik Tews <hendrik at askra.de>  Fri, 31 May 2013 22:59:35 +0200
+ -- Hendrik Tews <hendrik at askra.de>  Fri, 07 Jun 2013 14:17:03 +0200
 
 oasis (0.3.0-1) unstable; urgency=low
 
diff --git a/debian/liboasis-ocaml-dev.install.in b/debian/liboasis-ocaml-dev.install.in
index 962404b..87d383a 100644
--- a/debian/liboasis-ocaml-dev.install.in
+++ b/debian/liboasis-ocaml-dev.install.in
@@ -1,5 +1,4 @@
- at OCamlStdlibDir@/oasis/*.cm[ix]
- at OCamlStdlibDir@/oasis/*.ml*
+ at OCamlStdlibDir@/oasis/*.cmx
 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 a82f46d..7249654 100644
--- a/debian/liboasis-ocaml.install.in
+++ b/debian/liboasis-ocaml.install.in
@@ -1,5 +1,6 @@
 @OCamlStdlibDir@/oasis/META
- at OCamlStdlibDir@/oasis/*.cm[ao]
+ at OCamlStdlibDir@/oasis/*.ml*
+ at OCamlStdlibDir@/oasis/*.cm[iao]
 DYN: @OCamlStdlibDir@/oasis/*.cmxs
 @OCamlStdlibDir@/plugin-loader/META
 @OCamlStdlibDir@/plugin-loader/*.cm[ao]
diff --git a/debian/patches/fix-ocamlbuild-deps.patch b/debian/patches/fix-ocamlbuild-deps.patch
new file mode 100644
index 0000000..be5ddc5
--- /dev/null
+++ b/debian/patches/fix-ocamlbuild-deps.patch
@@ -0,0 +1,13 @@
+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/fixperms-debian-rules.patch b/debian/patches/fixperms-debian-rules.patch
new file mode 100644
index 0000000..d6eadaa
--- /dev/null
+++ b/debian/patches/fixperms-debian-rules.patch
@@ -0,0 +1,9 @@
+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 051db6b..ce3b398 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 debian-changes-0.2.0-4
 lintian-spelling.patch
 fix-ocamlbuild-plugin-export.patch
+fix-ocamlbuild-deps.patch
+fixperms-debian-rules.patch
diff --git a/debian/rules b/debian/rules
index 7f6eb19..873b0ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ export OCAMLFIND_LDCONF
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir '/usr/share/doc/liboasis-ocaml-doc'
+	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir '/usr/share/doc/liboasis-ocaml-doc' --enable-tests
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:

-- 
oasis packaging