[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. upstream/1.3-13-g84e6ef1

Tue Jun 16 14:50:28 UTC 2009

The following commit has been merged in the master branch:
commit 84e6ef1cf760fee12a75b0045a1a9d70d06b68a9
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Tue Jun 16 16:46:18 2009 +0200

    Shared library built and package split in -ocaml-dev and -ocaml.

diff --git a/debian/control b/debian/control
index 44476fb..0ae43c9 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,31 @@ Build-Depends: cdbs (>= 0.4.52),
  libcalendar-ocaml-dev (>= 2)
 Standards-Version: 3.8.1
 Homepage: http://developer.berlios.de/projects/pgocaml/
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pgocaml.git
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pgocaml.git
 
 Package: libpgocaml-ocaml-dev
 Architecture: any
 Depends: ocaml-base-nox-${F:OCamlABI},
- libextlib-ocaml-dev,
+ libpgocaml-ocaml
+ ${misc:Depends}
+Recommends: ocaml-findlib
+Suggests: postgresql (>= 7.4)
+Description: OCaml type-safe bindings for PostgreSQL
+ PG'OCaml provides an interface to PostgreSQL databases for OCaml applications.
+ It uses Camlp4 to extend the OCaml syntax, enabling one to directly embed SQL
+ statements inside the OCaml code. Moreover, it uses the describe feature of
+ PostgreSQL to obtain type information about the database. This allows PG'OCaml
+ to check at compile-time if the program is indeed consistent with the database
+ structure. This type-safe database access is the primary advantage that
+ PG'OCaml has over other PostgreSQL bindings for OCaml.
+ .
+ This package contains development files for PG'OCaml.
+
+Package: libpgocaml-ocaml
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI},
+ libextlib-ocaml-dev
  libpcre-ocaml-dev,
  libcsv-ocaml-dev,
  libcalendar-ocaml-dev (>= 2),
@@ -36,3 +56,5 @@ Description: OCaml type-safe bindings for PostgreSQL
  to check at compile-time if the program is indeed consistent with the database
  structure. This type-safe database access is the primary advantage that
  PG'OCaml has over other PostgreSQL bindings for OCaml.
+ .
+ This package contains dynamically loadable plugins for PostgreSQL.
diff --git a/debian/libpgocaml-ocaml-dev.dirs.in b/debian/libpgocaml-ocaml-dev.dirs.in
index cc51687..2ce57fe 100644
--- a/debian/libpgocaml-ocaml-dev.dirs.in
+++ b/debian/libpgocaml-ocaml-dev.dirs.in
@@ -1 +1 @@
- at OCamlStdlibDir@
+ at OCamlStdlibDir@/pgocaml/
diff --git a/debian/libpgocaml-ocaml-dev.install.in b/debian/libpgocaml-ocaml-dev.install.in
new file mode 100644
index 0000000..d5f6309
--- /dev/null
+++ b/debian/libpgocaml-ocaml-dev.install.in
@@ -0,0 +1,5 @@
+*.mli         @OCamlStdlibDir@/pgocaml
+OPT: *.a      @OCamlStdlibDir@/pgocaml
+OPT: *.cmx    @OCamlStdlibDir@/pgocaml
+OPT: *.cmxa   @OCamlStdlibDir@/pgocaml
+*.cmi         @OCamlStdlibDir@/pgocaml
diff --git a/debian/libpgocaml-ocaml.dirs.in b/debian/libpgocaml-ocaml.dirs.in
new file mode 100644
index 0000000..2ce57fe
--- /dev/null
+++ b/debian/libpgocaml-ocaml.dirs.in
@@ -0,0 +1 @@
+ at OCamlStdlibDir@/pgocaml/
diff --git a/debian/libpgocaml-ocaml.install.in b/debian/libpgocaml-ocaml.install.in
new file mode 100644
index 0000000..0491271
--- /dev/null
+++ b/debian/libpgocaml-ocaml.install.in
@@ -0,0 +1,3 @@
+META          @OCamlStdlibDir@/pgocaml
+*.cma         @OCamlStdlibDir@/pgocaml
+OPT: *.cmxs   @OCamlStdlibDir@/pgocaml
diff --git a/debian/patches/00list b/debian/patches/00list
index 34c38ff..41696e2 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 01_postgresql_socket
 02_makefile_mli
+03_makefile_cmxs
diff --git a/debian/patches/03_makefile_cmxs.dpatch b/debian/patches/03_makefile_cmxs.dpatch
new file mode 100755
index 0000000..2df14cb
--- /dev/null
+++ b/debian/patches/03_makefile_cmxs.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_makefile_cmxs.dpatch by  <yziquel at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
+--- pgocaml-1.3~/Makefile	2009-06-16 15:06:32.000000000 +0200
++++ pgocaml-1.3/Makefile	2009-06-16 15:21:37.000000000 +0200
+@@ -61,7 +61,7 @@
+ OBJS	:= pGOCaml_config.cmo pGOCaml_generic.cmo pGOCaml.cmo
+ XOBJS	:= $(OBJS:.cmo=.cmx)
+ 
+-all: META pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pa_pgsql.cmo pgocaml_prof$(EXECUTABLE_SUFFIX)
++all: META pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pgocaml.cmxs pa_pgsql.cmo pgocaml_prof$(EXECUTABLE_SUFFIX)
+ 
+ test: test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX) test_pgocaml$(EXECUTABLE_SUFFIX)
+ 
+@@ -99,6 +99,9 @@
+ pgocaml.cmxa: $(XOBJS)
+ 	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -a -o $@ $^
+ 
++pgocaml.cmxs: pgocaml.cmxa
++	ocamlfind ocamlopt $(OCAMLOPTPACKAGES) -shared -linkall -o $@ $<
++
+ pGOCaml_config.ml: pGOCaml_config.ml.in Makefile Makefile.config
+ 	< $< sed -e "s|@DEFAULT_UNIX_DOMAIN_SOCKET_DIR@|$(DEFAULT_UNIX_DOMAIN_SOCKET_DIR)|" > $@
+ 
+@@ -150,7 +153,7 @@
+ #
+ 
+ findlib_install:
+-	ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa pGOCaml_generic.cm[ix] pGOCaml.cm[ix] pa_pgsql.cmo pGOCaml_generic.mli pGOCaml.mli
++	ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa pgocaml.cmxs pGOCaml_generic.cm[ix] pGOCaml.cm[ix] pa_pgsql.cmo pGOCaml_generic.mli pGOCaml.mli
+ 
+ reinstall:
+ 	ocamlfind remove $(PACKAGE)
diff --git a/debian/rules b/debian/rules
index ebbbd36..d8721d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,21 +22,20 @@ include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/class/ocaml.mk
 
-DESTDIR_DEV=$(CURDIR)/debian/libpgocaml-ocaml-dev
+#DESTDIR_DEV=$(CURDIR)/debian/libpgocaml-ocaml-dev
 
 DEB_MAKE_CLEAN_TARGET    := clean
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET    := all
-DEB_MAKE_INSTALL_TARGET  := findlib_install
+#DEB_MAKE_INSTALL_TARGET  := findlib_install
 else
 DEB_MAKE_BUILD_TARGET    := all
-DEB_MAKE_INSTALL_TARGET  := findlib_install
+#DEB_MAKE_INSTALL_TARGET  := findlib_install
 endif
-DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
+#DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
 OCAML_OCAMLDOC_PACKAGES = libpgocaml-ocaml-dev
 OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package extlib -package pcre -package csv -package calendar
-#OCAML_OCAMLDOC_FLAGS += -I +camlp4
 
 pre-build::
 	make depend

-- 
pgocaml packaging

