[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090902+beryllium+dfsg-2-3-g7771834

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 0906ff8b06db6a1ce0a1605344c0d99dc9cb9332
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Jan 22 12:04:47 2010 +0100

    Fix FTBFS on bytecode architectures

diff --git a/debian/changelog b/debian/changelog
index 0169b0c..280535b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+frama-c (20090902+beryllium+dfsg-3) unstable; urgency=low
+
+  * Fix FTBFS on bytecode architectures
+    - 0003-Do-not-install-native-Kernel-modules-on-bytecode-architectures
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 22 Jan 2010 11:59:37 +0100
+
 frama-c (20090902+beryllium+dfsg-2) unstable; urgency=low
 
   * Fix installability problem by installing frama-c-gui.1 only once.
diff --git a/debian/patches/0003-Do-not-install-native-Kernel-modules-on-bytecode-arc.patch b/debian/patches/0003-Do-not-install-native-Kernel-modules-on-bytecode-arc.patch
new file mode 100644
index 0000000..0623c8c
--- /dev/null
+++ b/debian/patches/0003-Do-not-install-native-Kernel-modules-on-bytecode-arc.patch
@@ -0,0 +1,25 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Fri, 22 Jan 2010 11:59:24 +0100
+Subject: [PATCH] Do not install native Kernel modules on bytecode architectures
+
+---
+ Makefile |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5c88587..7737f85 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1604,7 +1604,10 @@ install:
+ 	  $(CP)  $(PLUGIN_DYN_GUI_CMO_LIST) $(PLUGIN_DYN_GUI_CMX_LIST) \
+ 		 $(FRAMAC_PLUGINDIR)/gui; \
+ 	fi
+-	$(MAKE) install-kernel-byte install-kernel-opt
++	$(MAKE) install-kernel-byte
++	if [ "$(OCAMLBEST)" = "opt" ]; then \
++		$(MAKE) install-kernel-opt; \
++	fi
+ 	$(MAKE) install-gui
+ 	$(PRINT_CP) man pages
+ 	$(CP) man/frama-c.1 $(MANDIR)/man1
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 1ffb0c5..2381cb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Use-GSourceView2.patch
 0002-Fix-hyphen-used-as-minus-sign.patch
+0003-Do-not-install-native-Kernel-modules-on-bytecode-arc.patch

-- 
frama-c packaging