[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.4.0-1-5-g2493643

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 249364346077ad2eb2ee700ef8dcfa4eaa920ce3
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon May 18 16:00:48 2009 +0200

    Prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 48ce56e..e61204b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocaml-sqlite3 (1.4.0-2) UNRELEASED; urgency=low
+ocaml-sqlite3 (1.4.0-2) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
   * set archive section to "ocaml"
@@ -6,7 +6,7 @@ ocaml-sqlite3 (1.4.0-2) UNRELEASED; urgency=low
   [ Stephane Glondu ]
   * Move .cma and META to libsqlite3-ocaml, build .cmxs
 
- -- Stephane Glondu <steph at glondu.net>  Sat, 11 Apr 2009 23:45:35 +0200
+ -- Stephane Glondu <steph at glondu.net>  Mon, 18 May 2009 16:00:26 +0200
 
 ocaml-sqlite3 (1.4.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 46fec63..9762d05 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Package: libsqlite3-ocaml
 Architecture: any
 Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Replaces: libsqlite3-ocaml-dev (<< 1.4.0-2)
+Conflicts: libsqlite3-ocaml-dev (<< 1.4.0-2)
 Description: Embeddable SQL Database for OCaml Programs
  This package provides an interface for the SQLite3 embeddable SQL
  database. It allows your OCaml programs to use a SQL database without
diff --git a/debian/libsqlite3-ocaml-dev.install.in b/debian/libsqlite3-ocaml-dev.install.in
index b6085b7..a8e9af7 100644
--- a/debian/libsqlite3-ocaml-dev.install.in
+++ b/debian/libsqlite3-ocaml-dev.install.in
@@ -1,5 +1,5 @@
 @OCamlStdlibDir@/sqlite3/*.cmi
 @OCamlStdlibDir@/sqlite3/*.ml*
- at OCamlStdlibDir@/sqlite3/lib*.a
+ at OCamlStdlibDir@/sqlite3/*.a
 OPT: @OCamlStdlibDir@/sqlite3/*.cmx
 OPT: @OCamlStdlibDir@/sqlite3/*.cmxa

-- 
ocaml-sqlite3 packaging