[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.10.3-1-13-gd72a362

[Stephane Glondu]

The following commit has been merged in the master branch:
commit d72a362c4d90aed3f6c7925ebc1d5d90c0cdb463
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Sep 7 10:24:01 2009 +0200

    Build native plugin, install plugins in libpostgresql-ocaml

diff --git a/debian/changelog b/debian/changelog
index 4826f6b..16b3811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ postgresql-ocaml (1.11.1-1) UNRELEASED; urgency=low
     - add myself to Uploaders
     - move to section ocaml
     - update Standards-Version to 3.8.3
+  * Build native plugin, install plugins in libpostgresql-ocaml
 
   [ Stefano Zacchiroli ]
   * debian/copyright: snip away unnecessary details (which also contained
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..1468c5d
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+lib/postgresql.cmxs
diff --git a/debian/control b/debian/control
index 274787d..6643f3e 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Breaks: nurpawiki (<< 1.2.2-5~)
+Replaces: libpostgresql-ocaml-dev (<< 1.11.1)
+Conflicts: libpostgresql-ocaml-dev (<< 1.11.1)
 Description: OCaml bindings to PostgreSQL's libpq (runtime)
  This OCaml-library provides an interface to PostgreSQL, an
  efficient and reliable, open source, relational database.
diff --git a/debian/libpostgresql-ocaml-dev.install.in b/debian/libpostgresql-ocaml-dev.install.in
new file mode 100644
index 0000000..99505d1
--- /dev/null
+++ b/debian/libpostgresql-ocaml-dev.install.in
@@ -0,0 +1,6 @@
+ at OCamlStdlibDir@/postgresql/*.cmi
+ at OCamlStdlibDir@/postgresql/*.mli
+ at OCamlStdlibDir@/postgresql/lib*.a
+OPT: @OCamlStdlibDir@/postgresql/*.a
+OPT: @OCamlStdlibDir@/postgresql/*.cmxa
+OPT: lib/postgresql.cmx @OCamlStdlibDir@/postgresql
diff --git a/debian/libpostgresql-ocaml.install.in b/debian/libpostgresql-ocaml.install.in
new file mode 100644
index 0000000..580061f
--- /dev/null
+++ b/debian/libpostgresql-ocaml.install.in
@@ -0,0 +1,4 @@
+debian/tmp at OCamlStdlibDir@/postgresql/*.so @OCamlDllDir@
+ at OCamlStdlibDir@/postgresql/META
+ at OCamlStdlibDir@/postgresql/*.cma
+OPT: lib/postgresql.cmxs @OCamlStdlibDir@/postgresql
diff --git a/debian/rules b/debian/rules
index 7f9f9ac..a65e9b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,17 +11,14 @@ DEB_SRCDIR = $(CURDIR)/lib
 DEB_QUILT_TOPDIR = $(CURDIR)
 DEB_MAKE_BUILD_TARGET = byte-code-library
 CFLAGS += -I$(shell pg_config --includedir) -fPIC
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) -C $(DEB_SRCDIR)/ native-code-library
+	cd $(DEB_SRCDIR) && ocamlopt -shared -I . -o postgresql.cmxs -linkall postgresql.cmxa
 endif
 
 ifneq ($(OCAML_HAVE_OCAMLOPT),yes)
 export LIBINSTALL_FILES = libpostgresql_stubs.a postgresql.cma postgresql.cmi postgresql.mli dllpostgresql_stubs.so
 endif
-
-binary-install/$(PKGNAME)::
-	mv $(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)/postgresql/*.so \
-		$(CURDIR)/debian/$(patsubst %-dev,%,$(PKGNAME))$(OCAML_STDLIB_DIR)/stublibs/

-- 
postgresql-ocaml packaging