[Pkg-ocaml-maint-commits] [SCM] oasis packaging branch, master, updated. debian/0.2.0-7-4-g9b276ea

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 9b276eaa3870a339ffb16e0aaa2c57c9e2500f2c
Author: Hendrik Tews <hendrik at askra.de>
Date:   Thu May 30 11:52:43 2013 +0200

    fix builtin-plugins.cma, missing mli and changelog

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index bd48e4c..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,11 +0,0 @@
-The package liboasis-ocaml does currently not contain the byte-code
-library builtin-plugins.cma. The reason is that the upstream build
-procedure links the standard library ocamlbuildlib.cma into
-builtin-plugins.cma. Therefore, builtin-plugins.cma contains standard
-modules that are also contained in ocamlbuildlib.cma and the Debian
-build scripts (dh_ocaml) fail on builtin-plugins.cma.
-
-The native plugin builtin-plugins.cmxs does not suffer from this
-problem.
-
- -- Hendrik Tews <hendrik at askra.de>, Wed, 29 May 2013 22:44:42 +0200
diff --git a/debian/changelog b/debian/changelog
index 33187ae..7df92e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,27 +1,26 @@
 oasis (0.3.0-1) unstable; urgency=low
 
-  * Imported Upstream version 0.3.0
+  * Imported Upstream version 0.3.0 (Closes: #684563)
   * fix copyright file
   * refresh patches
     - remove dubious patch debian-changes-0.2.0-1
-    - remove debian-changes-0.2.0-4 because of upstream fix
+    - remove cope_with_ounit1.1.1 because of upstream fix
+    - fix description in debian-changes-0.2.0-4
+    - add lintian-spelling for spelling errors
+    - add fix-ocamlbuild-plugin-export for the Ocamlbuild_plugin 
+      export problem
   * add myself as uploader
   * bump standards version and debhelper compat level
+  * build missing src/oasis/OASISData.mli
   * fix debian/rules
   * delete cleaner from gbd.conf
   * fix build dependencies
   * fix *.install files
-  * fix description in patch debian-changes-0.2.0-4
-  * delete patches debian-changes-0.2.0-1 and 
-    cope_with_ounit1.1.1_changes.patch
   * improve package description and man page (triggered by lintian)
   * add lintian override for 
     liboasis-ocaml-dev: extra-license-file usr/lib/ocaml/oasis/OASISLicense.cmi
-  * omit builtin-plugins.cma because of dh_ocaml error caused by 
-    builtin-plugins.cma containing ocamlbuildlib.cma
-  * add README.Debian about builtin-plugins.cma
 
- -- Hendrik Tews <hendrik at askra.de>  Wed, 29 May 2013 22:44:47 +0200
+ -- Hendrik Tews <hendrik at askra.de>  Thu, 30 May 2013 11:40:09 +0200
 
 oasis (0.2.0-7) unstable; urgency=low
 
diff --git a/debian/patches/fix-ocamlbuild-plugin-export.patch b/debian/patches/fix-ocamlbuild-plugin-export.patch
new file mode 100644
index 0000000..6556ed2
--- /dev/null
+++ b/debian/patches/fix-ocamlbuild-plugin-export.patch
@@ -0,0 +1,13 @@
+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/lintian-spelling.patch b/debian/patches/lintian-spelling.patch
index dd28712..79e767e 100644
--- a/debian/patches/lintian-spelling.patch
+++ b/debian/patches/lintian-spelling.patch
@@ -18,7 +18,7 @@ Author: Hendrik Tews <hendrik at askra.de>
  ### SourceRepository 
  
 -Define VCS informations. There is two special identified repository: 
-+Define VCS information. 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/debian/patches/series b/debian/patches/series
index a50e59a..051db6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debian-changes-0.2.0-4
 lintian-spelling.patch
+fix-ocamlbuild-plugin-export.patch
diff --git a/debian/rules b/debian/rules
index 01496de..7f6eb19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,8 @@ override_dh_auto_configure:
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
 	ocaml setup.ml -build
+	ocamlbuild src/oasis/OASISData.inferred.mli
+	cp -i _build/src/oasis/OASISData.inferred.mli src/oasis/OASISData.mli
 	ocaml setup.ml -doc
 
 .PHONY: override_dh_auto_test
@@ -38,7 +40,7 @@ override_dh_auto_install:
 
 .PHONY: override_dh_install
 override_dh_install:
-	dh_install --exclude=builtin-plugins.cma --fail-missing
+	dh_install --fail-missing
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:

-- 
oasis packaging