[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/0.20090405+beta1-5-13-g976fac3

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 976fac3cdf0b2871ac88cb619bd6528f7c5cab62
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Mar 6 15:18:48 2010 +0100

    new patch 0001-install-fix-for-bytecode-only-build
    
    avoid installing *.a files with bytecode only compilation

diff --git a/debian/changelog b/debian/changelog
index cbccbc0..398be1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ ocaml-batteries (1.1.0-1) UNRELEASED; urgency=low
     - adapt to new stuff shipped by upstream
     - switch from CDBS to dh
     - adapt dependencies (generally: reduce them)
-  * remove old debian/patches/{debian-specific-installation-paths,
-    debian-specific-info-on-doc-availability} as obsolete
+  * debian/patches/
+    - remove old debian/patches/{debian-specific-installation-paths,
+      debian-specific-info-on-doc-availability} as obsolete
+    - new patch 0001-install-fix-for-bytecode-only-build: avoid
+      installing *.a files with bytecode only compilation
   * remove debian/README.Debian (previous content is now obsolete)
   * bump Standards-Version to 3.8.4 (no changes needed)
   * debian/watch: update to match new upstream version convention
diff --git a/debian/patches/0001-install-fix-for-bytecode-only-build.patch b/debian/patches/0001-install-fix-for-bytecode-only-build.patch
new file mode 100644
index 0000000..fb25ba8
--- /dev/null
+++ b/debian/patches/0001-install-fix-for-bytecode-only-build.patch
@@ -0,0 +1,27 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Sat, 6 Mar 2010 15:14:09 +0100
+Subject: [PATCH] install fix for bytecode only build
+
+do not try to install *.a files when native code compilation has not
+been performed
+---
+ src/OMakefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/OMakefile b/src/OMakefile
+index e4b1648..e520f8e 100644
+--- a/src/OMakefile
++++ b/src/OMakefile
+@@ -119,9 +119,9 @@ batteries_config.ml: batteries_config.mlp
+ 	    batteries_config.mlp > batteries_config.ml
+ 	chmod(444 batteries_config.ml)
+ 
+-BAT_FILES[] += $(file $(glob *.mli *.cmi *.cma $(EXTRA) *.a))
++BAT_FILES[] += $(file $(glob *.mli *.cmi *.cma $(EXTRA)))
+ if $(NATIVE_ENABLED)
+-	BAT_FILES[] += $(file $(glob *.cmx *.cmxa))
++	BAT_FILES[] += $(file $(glob *.cmx *.cmxa *.a))
+ 	export BAT_FILES
+ 
+ all: batteries.cma batteries_uni.cma $(if $(NATIVE_ENABLED), batteries.cmxa batteries_uni.cmxa) $(EXTRA)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..19547b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-install-fix-for-bytecode-only-build.patch

-- 
ocaml-batteries packaging