[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.5.6-3-13-g3b5bc85

Stephane Glondu steph at glondu.net
Tue Jul 12 07:07:24 UTC 2011


The following commit has been merged in the master branch:
commit 334573515175deb26901b32d372e5049a53ea5f8
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 6 14:29:54 2011 +0200

    Refresh patches

diff --git a/debian/patches/0001-Install-no-mktop.patch b/debian/patches/0001-Install-no-mktop.patch
index a38a0c3..9c49743 100644
--- a/debian/patches/0001-Install-no-mktop.patch
+++ b/debian/patches/0001-Install-no-mktop.patch
@@ -1,6 +1,6 @@
 From: Samuel Mimram <smimram at debian.org>
 Date: Tue, 30 Jun 2009 20:38:46 +0200
-Subject: [PATCH] Install no mktop
+Subject: Install no mktop
 
 Allow installation without building in native mode
 
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
index 75a74d4..e67de6a 100644
--- 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
@@ -1,6 +1,6 @@
 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
+Subject: Do native test only if sqlite3.cmxa has been compiled
 
 Signed-off-by: Stephane Glondu <steph at glondu.net>
 ---
@@ -22,7 +22,7 @@ index 9f0ef79..0e03f2c 100644
  
  clean:
 diff --git a/test/Makefile b/test/Makefile
-index 6f44141..4073644 100644
+index 8bfed3b..d379649 100644
 --- a/test/Makefile
 +++ b/test/Makefile
 @@ -5,7 +5,7 @@ TESTS = $(wildcard *.ml)
@@ -33,5 +33,5 @@ index 6f44141..4073644 100644
 +opt: $(if $(wildcard ../sqlite3.cmxa),$(TESTS:%.ml=%.exe),)
  
  %.bc: %.ml
- 	ocamlc -w Ae -warn-error Ae -I .. str.cma sqlite3.cma $< -o $@
+ 	ocamlc -w Ae -warn-error Ae -I .. -dllpath .. str.cma sqlite3.cma $< -o $@
 -- 

-- 
ocaml-sqlite3 packaging



More information about the Pkg-ocaml-maint-commits mailing list