Package: sks
Severity: normal
Forgot to attach the patches :-).
O.
diff --git a/debian/control b/debian/control
index e12d147..f3d9af2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Standards-Version: 3.8.3
Maintainer: Christoph Martin <[email protected]>
Uploaders: Fabio M. Di Nitto <[email protected]>
-Build-Depends: ocaml (>= 3.08), camlp4, libdb4.7-dev, debhelper (>= 7.0.50~), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc
+Build-Depends: ocaml (>= 3.08), camlp4, libdb-dev, debhelper (>= 7.0.50~), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc
Package: sks
Architecture: any
diff --git a/debian/patches/203_db.patch b/debian/patches/203_db.patch
new file mode 100644
index 0000000..86e327e
--- /dev/null
+++ b/debian/patches/203_db.patch
@@ -0,0 +1,11 @@
+--- a/bdb/Makefile
++++ b/bdb/Makefile
+@@ -29,7 +29,7 @@
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40
+
+ ifndef LIBDB
+-LIBDB=-ldb-4.6
++LIBDB=-ldb
+ endif
+
+ COBJS = bdb_stubs.o
diff --git a/debian/patches/203_db47.patch b/debian/patches/203_db47.patch
deleted file mode 100644
index c914190..0000000
--- a/debian/patches/203_db47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bdb/Makefile
-+++ b/bdb/Makefile
-@@ -29,7 +29,7 @@
- OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40
-
- ifndef LIBDB
--LIBDB=-ldb-4.6
-+LIBDB=-ldb-4.7
- endif
-
- COBJS = bdb_stubs.o
diff --git a/debian/patches/series b/debian/patches/series
index 610aac0..6dce28e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
202_makefile_bytecode.patch
-203_db47.patch
+203_db.patch
500_debian_fhs.patch
501_makefile_cflags.patch
502_makefile_install.patch
diff --git a/debian/patches/512_db5.1.patch b/debian/patches/512_db5.1.patch
new file mode 100644
index 0000000..cb21943
--- /dev/null
+++ b/debian/patches/512_db5.1.patch
@@ -0,0 +1,20 @@
+--- a/bdb/bdb_stubs.c
++++ b/bdb/bdb_stubs.c
+@@ -190,7 +190,7 @@ value caml_db_init(value v){
+ //+ type dbenv
+ //+ type db
+
+-void raise_db(char *msg) {
++void raise_db(const char *msg) {
+ raise_with_string(*caml_db_exn, msg);
+ }
+
+@@ -206,7 +206,7 @@ void raise_run_recovery() {
+ // calls to DB->err and DBENV->err lead to exceptions.
+
+ // FIX: currently, prefix is ignored. Should be concatenated.
+-void raise_db_cb(const DB_ENV *dbenv, const char *prefix, char *msg) {
++void raise_db_cb(const DB_ENV *dbenv, const char *prefix, const char *msg) {
+ raise_db(msg);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 6dce28e..2e7d136 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
509-content-types.patch
510-allowed-chars.patch
511_gcc44.patch
+512_db5.1.patch
