[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.5.6-2-1-g264ccba

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 264ccba20513096b962c74f815902b4acb232559
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Oct 18 15:28:41 2009 +0200

    Add Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch

diff --git a/debian/changelog b/debian/changelog
index 0d8ec84..90c812c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-sqlite3 (1.5.6-3) unstable; urgency=low
+
+  * Add Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch
+    (fixes FTBFS on bytecode architectures)
+
+ -- Stéphane Glondu <glondu at debian.org>  Sun, 18 Oct 2009 15:35:03 +0200
+
 ocaml-sqlite3 (1.5.6-2) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0001-Install-no-mktop.patch b/debian/patches/0001-Install-no-mktop.patch
index bd81aeb..a38a0c3 100644
--- a/debian/patches/0001-Install-no-mktop.patch
+++ b/debian/patches/0001-Install-no-mktop.patch
@@ -3,15 +3,18 @@ Date: Tue, 30 Jun 2009 20:38:46 +0200
 Subject: [PATCH] Install no mktop
 
 Allow installation without building in native mode
+
+Signed-off-by: Samuel Mimram <smimram at debian.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
  Makefile.in |    8 ++------
  1 files changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 590cb89..3c6d838 100644
+index 675324f..9f0ef79 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -38,13 +38,9 @@ clean:
+@@ -42,13 +42,9 @@ clean:
  distclean: clean
  	rm -rf autom4te.* config.* META Makefile doc
  
diff --git a/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch b/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch
new file mode 100644
index 0000000..75a74d4
--- /dev/null
+++ b/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch
@@ -0,0 +1,37 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sun, 18 Oct 2009 15:27:11 +0200
+Subject: [PATCH] Do native test only if sqlite3.cmxa has been compiled
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile.in   |    2 +-
+ test/Makefile |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9f0ef79..0e03f2c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -32,7 +32,7 @@ bytecode: sqlite3.cma sqlite3top
+ 
+ opt: sqlite3.cmxa
+ 
+-test:	bytecode opt
++test:
+ 	@cd test && $(MAKE) all
+ 
+ clean:
+diff --git a/test/Makefile b/test/Makefile
+index 6f44141..4073644 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -5,7 +5,7 @@ TESTS = $(wildcard *.ml)
+ all: bytecode opt
+ 
+ bytecode: $(TESTS:%.ml=%.bc)
+-opt: $(TESTS:%.ml=%.exe)
++opt: $(if $(wildcard ../sqlite3.cmxa),$(TESTS:%.ml=%.exe),)
+ 
+ %.bc: %.ml
+ 	ocamlc -w Ae -warn-error Ae -I .. str.cma sqlite3.cma $< -o $@
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4afb03c..b48c8c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Install-no-mktop.patch
+0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch

-- 
ocaml-sqlite3 packaging