The following commit has been merged in the master branch:
commit 8c24aa3c55bc98acd4cd20dd95b5dd3331db122a
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 20:11:36 2013 +0200
Adapt packaging to new build system
diff --git a/debian/control b/debian/control
index ccef075..b74395f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends:
ocaml-nox (= 3.11.1-3~),
ocaml-findlib (= 1.2.5),
libpq-dev,
- dh-ocaml (= 0.9.6~),
- cdbs
+ dh-ocaml (= 0.9.6~)
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/postgresql-ocaml.git
Vcs-Browser:
http://git.debian.org/?p=pkg-ocaml-maint/packages/postgresql-ocaml.git
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 71dfd5b..000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.txt
diff --git a/debian/libpostgresql-ocaml-dev.doc-base
b/debian/libpostgresql-ocaml-dev.doc-base
new file mode 100644
index 000..eef8075
--- /dev/null
+++ b/debian/libpostgresql-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: libpostgresql-ocaml-dev
+Title: API for PostgreSQL bindings
+Author: Markus Mottl
+Abstract: Ocamldoc-generated documentation for OCaml PostgreSQL bindings
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libpostgresql-ocaml-dev/api/index.html
+Files: /usr/share/doc/libpostgresql-ocaml-dev/api/*.html
diff --git a/debian/libpostgresql-ocaml-dev.docs
b/debian/libpostgresql-ocaml-dev.docs
new file mode 100644
index 000..b43bf86
--- /dev/null
+++ b/debian/libpostgresql-ocaml-dev.docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/libpostgresql-ocaml-dev.install.in
b/debian/libpostgresql-ocaml-dev.install.in
index 99505d1..7b22a4b 100644
--- a/debian/libpostgresql-ocaml-dev.install.in
+++ b/debian/libpostgresql-ocaml-dev.install.in
@@ -3,4 +3,5 @@
@OCamlStdlibDir@/postgresql/lib*.a
OPT: @OCamlStdlibDir@/postgresql/*.a
OPT: @OCamlStdlibDir@/postgresql/*.cmxa
-OPT: lib/postgresql.cmx @OCamlStdlibDir@/postgresql
+OPT: @OCamlStdlibDir@/postgresql/*.cmx
+usr/share/doc/postgresql-ocaml/api usr/share/doc/libpostgresql-ocaml-dev/
diff --git a/debian/libpostgresql-ocaml-dev.ocamldoc
b/debian/libpostgresql-ocaml-dev.ocamldoc
deleted file mode 100644
index 1bfdd46..000
--- a/debian/libpostgresql-ocaml-dev.ocamldoc
+++ /dev/null
@@ -1 +0,0 @@
-# This file must not be empty to be represented in .diff.gz!
diff --git a/debian/libpostgresql-ocaml.install.in
b/debian/libpostgresql-ocaml.install.in
index 2b649b9..a1440f3 100644
--- a/debian/libpostgresql-ocaml.install.in
+++ b/debian/libpostgresql-ocaml.install.in
@@ -1,4 +1,4 @@
-debian/tmp@OCamlStdlibDir@/postgresql/*.so @OCamlDllDir@
+@OCamlDllDir@/*.so @OCamlDllDir@
@OCamlStdlibDir@/postgresql/META
@OCamlStdlibDir@/postgresql/*.cma
-DYN: lib/postgresql.cmxs @OCamlStdlibDir@/postgresql
+DYN: @OCamlStdlibDir@/postgresql/*.cmxs
diff --git a/debian/patches/0001-DESTDIR-in-Makefiles.patch
b/debian/patches/0001-DESTDIR-in-Makefiles.patch
deleted file mode 100644
index ca70815..000
--- a/debian/patches/0001-DESTDIR-in-Makefiles.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Stephane Glondu st...@glondu.net
-Date: Mon, 7 Sep 2009 09:47:23 +0200
-Subject: DESTDIR in Makefiles
-
-Enable passing target installation directory from debian/rules.
-
-Signed-off-by: Stefano Zacchiroli z...@debian.org
-Signed-off-by: Stephane Glondu st...@glondu.net
- OCamlMakefile |3 +++
- lib/Makefile |2 ++
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/OCamlMakefile b/OCamlMakefile
-index b8898ad..2ba893d 100644
a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -1211,12 +1211,14 @@ subprojs: $(SUBPROJS:%=subproj_%)
- .PHONY: libinstall
- libinstall: all
- $(QUIET)printf \nInstalling library with ocamlfind\n
-+ test -d $(DESTDIR) || mkdir -p $(DESTDIR)
- $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META
$(LIBINSTALL_FILES)
- $(QUIET)printf \nInstallation successful.\n
-
- .PHONY: libinstall-byte-code
- libinstall-byte-code: all
- $(QUIET)printf \nInstalling byte-code library with ocamlfind\n
-+ test -d $(DESTDIR) || mkdir -p $(DESTDIR)
- $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
- $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
- $(QUIET)printf \nInstallation successful.\n
-@@ -1224,6 +1226,7 @@ libinstall-byte-code:all
- .PHONY: libinstall-native-code
- libinstall-native-code: all
- $(QUIET)printf \nInstalling native-code library with ocamlfind\n
-+ test -d $(DESTDIR) || mkdir -p $(DESTDIR)
- $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
- $(filter-out $(DLLSONAME) $(RESULT).cma, $(LIBINSTALL_FILES))
- $(QUIET)printf \nInstallation successful.\n
-diff --git a/lib/Makefile b/lib/Makefile
-index 008e028..c458f4e 100644
a/lib/Makefile
-+++ b/lib/Makefile
-@@ -10,6 +10,8 @@ CLIBS = pq
- LIBS= threads
- RESULT = postgresql
-
