--- postgresql-ocaml-1.12.5.orig/debian/copyright +++ postgresql-ocaml-1.12.5/debian/copyright @@ -0,0 +1,37 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=179 +Packaged-By: Stefano Zacchiroli +Packaged-Date: Tue, 4 May 2004 15:33:22 +0200 +Upstream-Source: http://www.oefai.at/~markus/home/ocaml_sources.html +Upstream-Maintainer: Markus Mottl + +Files: * +Copyright: © 2001-2004 Alain Frisch + © 2004-2009 Markus Mottl +License: LGPL-2+ | other + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + As a special exception to the GNU Lesser General Public License, you + may link, statically or dynamically, a "work that uses the Library" + with a publicly distributed version of the Library to produce an + executable file containing portions of the Library, and distribute + that executable file under terms of your choice, without any of the + additional requirements listed in clause 6 of the GNU Lesser General + Public License. By "a publicly distributed version of the Library", + we mean either the unmodified Library as distributed by the authors, + or a modified version of the Library that is distributed under the + conditions defined in clause 3 of the GNU Lesser General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU Lesser + General Public License. + + The complete text of the GNU Lesser General Public License 2 can be + found in `/usr/share/common-licenses/LGPL-2'. + +Files: debian/* +Copyright: © 2004-2009 Stefano Zacchiroli +License: GPL-3+ + --- postgresql-ocaml-1.12.5.orig/debian/changelog +++ postgresql-ocaml-1.12.5/debian/changelog @@ -0,0 +1,259 @@ +postgresql-ocaml (1.12.5-1) unstable; urgency=low + + * New upstream release + + -- Mehdi Dogguy Sat, 15 May 2010 14:43:40 +0200 + +postgresql-ocaml (1.12.4-1) unstable; urgency=low + + [ Mehdi Dogguy ] + * New upstream release (Closes: #564816) + * Do not force custom mode (Pass NO_CUSTOM=y to make) + + [ Stéphane Glondu ] + * Bump Standards-Version to 3.8.4 (no changes) + + -- Stéphane Glondu Tue, 02 Mar 2010 23:34:36 +0100 + +postgresql-ocaml (1.12.1-2) unstable; urgency=low + + [ Mehdi Dogguy ] + * Add myself to uploaders + * Do not link system libraries into cma (Closes: #549794). + * Change include order in debian/rules to workaround a CDBS bug. + + [ Stéphane Glondu ] + * Switch packaging to dh-ocaml 0.9 + * Lower dependency to ocaml-findlib in libpostgresql-ocaml-dev to + Recommends + + -- Stéphane Glondu Tue, 06 Oct 2009 01:00:29 +0200 + +postgresql-ocaml (1.12.1-1) unstable; urgency=low + + * New Upstream Version + + -- Stefano Zacchiroli Sat, 19 Sep 2009 11:12:29 +0200 + +postgresql-ocaml (1.11.1-1) unstable; urgency=low + + [ Stéphane Glondu ] + * New Upstream Version + * Switch patches to quilt + * Add README.source + * debian/control: + - add versioned Breaks to nurpawiki because of binary incompatibility + - 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 + an obsolete FSF address), full details are available from + /usr/share/common-licenses/, as pointed to + + -- Stéphane Glondu Mon, 07 Sep 2009 11:12:17 +0200 + +postgresql-ocaml (1.10.3-1) unstable; urgency=low + + [ Stefano Zacchiroli ] + * New upstream release + * rebuild against OCaml 3.11 + - bump build-deps accordingly + - drop obsolete versioned dependencies + * debian/control + - bump standards-version to 3.8.0 (no changes needed) + - add missing ${misc:Depends} to -dev library package + - add build-dep on dh-ocaml, which now ships the CDBS class + * debian/rules: use ocaml.mk as a "rules" CDBS snippet + * debian/*.in: use explicit substitution variables instead of + making assumption on stdlib dir location + * debian/patches/ + - clean up obsolete dpatch headers and use dpatch-run + - examples.dpatch: remove the .in need, invoking ocamlc -where at + make-time to find the stdlib dir + - install_destdir.dpatch: delegate mkdir to make rather than dh_* + * bump debhelper compatibility level to 7 + * debian/docs: s/README/README.txt/ (new upstream name) + * debian/copyright: + - switch to machine parseable format + - use versioned filename references to /usr/share/common-licenses/ + + [ Stephane Glondu ] + * Switching packaging to git + + -- Stefano Zacchiroli Wed, 25 Feb 2009 17:24:40 +0100 + +postgresql-ocaml (1.7.0-3) unstable; urgency=low + + * update standards-version + - substitute binary:Version substvar in debian/control for Source-Version, + now deprecated + * add Homepage field to debian/control + * set me as an uploader, d-o-m as the maintainer + * debian/patches: + - add description to patches install_destdir.dpatch and examples.dpatch.in + - fix 00list: it should list examples.dpatch (i.e. examples.dpatch.in + after it has been generated) + - refresh examples.dpatch.in to point to the current location of + OCamlMakefile + * suggests ocamlmakefile and point out in README.Debian that it is easier + with it to compile examples + * add lintian override for missing examples.dpatch patch in 00list; the + patch is automatically generated from examples.dpatch.in + + -- Stefano Zacchiroli Sat, 29 Dec 2007 23:37:11 +0100 + +postgresql-ocaml (1.7.0-2) unstable; urgency=low + + * rebuild against OCaml 3.10 and upload to unstable (closes: #441158) + * debian/rules + - enable generation of ocamldoc api reference (via CDBS) + + -- Stefano Zacchiroli Sat, 08 Sep 2007 10:51:27 +0200 + +postgresql-ocaml (1.7.0-1) experimental; urgency=low + + * new upstream release + * rebuild with OCaml 3.10 + * bump debhelper build-dep and compatibility level to 5 + * debian/patches + - remove no longer needed patch 05_meta + - rename patches to more meaningful names + * debian/rules + - remove a workaround for dpatch, no longer needed with the latest + ocaml.mk + + -- Stefano Zacchiroli Fri, 13 Jul 2007 11:11:42 +0200 + +postgresql-ocaml (1.5.4-2) unstable; urgency=low + + * debian/rules + - use ocaml.mk + * debian/control + - bumped build dependency on ocaml-nox to >= 3.09.2-7, since we now use + ocaml.mk + + -- Stefano Zacchiroli Sat, 4 Nov 2006 09:40:01 +0100 + +postgresql-ocaml (1.5.4-1) unstable; urgency=low + + * New upstream release + * debian/patches/05_meta + - commented out this patch, in this upstream release version number in + META matches library version + * debian/rules + - removed no longer needed workaround for cdbs + dpatch + - avoid to create debian/control from debian/control.in on ocamlinit + - special handling of debian/patches/03_examples: + + for the examples to be binNMU safe the patch needs to be filled as + other .in files -> added the patch to OFILES + + for dpatch to work with a .in patch, the patch must be instantiated + before cleaning -> added a cdbs pre-clean dep on ocamlinit + * debian/control.in + - file removed, no longer needed + * debian/watch + - changed web site (upstream web page moved) + - switched to watch format version 3 + + -- Stefano Zacchiroli Wed, 6 Sep 2006 10:17:43 +0200 + +postgresql-ocaml (1.4.6-7) unstable; urgency=low + + * Upload to unstable. + * debian/patches/03_examples.dpatch + - removed hard coded ocaml ABI versions + + -- Stefano Zacchiroli Sat, 27 May 2006 12:00:55 +0200 + +postgresql-ocaml (1.4.6-6) experimental; urgency=low + + * Rebuilt against OCaml 3.09.2, bumped deps accordingly. + * Bumped Standards-Version to 3.7.2 (no changes needed). + + -- Stefano Zacchiroli Thu, 11 May 2006 22:11:22 +0000 + +postgresql-ocaml (1.4.6-5) experimental; urgency=low + + * Rebuilt against OCaml 3.09.2, bumped deps accordingly. + * Bumped Standards-Version to 3.7.2 (no changes needed). + + -- Stefano Zacchiroli Thu, 11 May 2006 22:07:09 +0000 + +postgresql-ocaml (1.4.6-4) unstable; urgency=low + + * Rebuilt against OCaml 3.09.1, bumped deps accordingly. + + -- Stefano Zacchiroli Sat, 7 Jan 2006 14:33:57 +0100 + +postgresql-ocaml (1.4.6-3) unstable; urgency=low + + * debian/rules + - proper setting of DEB_MAKE_INSTALL_TARGET when ocamlopt is not + available, fixes FTBFS on non native code archs + + -- Stefano Zacchiroli Sun, 13 Nov 2005 14:35:44 +0000 + +postgresql-ocaml (1.4.6-2) unstable; urgency=low + + * Rebuilt with ocaml 3.09 + * debian/* + - use cdbs + - no longer hardcoding of ocaml abi version anywhere + * debian/control + - bumped standards version + * debian/patches/ + - removed CFLAGS from 01_makefile.dpatch, now set via cdbs + - ported 03_examples.dpatch to ocaml 3.09 + + -- Stefano Zacchiroli Sun, 13 Nov 2005 10:24:55 +0000 + +postgresql-ocaml (1.4.6-1) unstable; urgency=low + + * New upstream release + * debian/control + - changed dependencies accordingly to new postgresql packaging + * debian/patches/01_makefile + - uses pg_config to guess proper include dir + - uses /dev/null instead of foo.ld.conf to fool findlib ld.conf handling + * debian/patches/05_meta + - fix postgresql-ocaml version in upstream META + + -- Stefano Zacchiroli Mon, 13 Jun 2005 11:10:08 +0200 + +postgresql-ocaml (1.4.2-2) unstable; urgency=low + + * Rebuilt against ocaml 3.08.3 + + -- Stefano Zacchiroli Thu, 24 Mar 2005 22:37:33 +0100 + +postgresql-ocaml (1.4.2-1) unstable; urgency=low + + * New upstream release (Closes: Bug#286662) + + -- Stefano Zacchiroli Tue, 21 Dec 2004 16:59:55 +0100 + +postgresql-ocaml (1.3.3-3) unstable; urgency=medium + + * debian/control + - depend on ocaml-base-nox-3.08 instead of ocaml-base-3.08 since + this package doesn't directly need ocaml X libraries + + -- Stefano Zacchiroli Tue, 24 Aug 2004 12:14:56 +0200 + +postgresql-ocaml (1.3.3-2) unstable; urgency=low + + * rebuilt with ocaml 3.08 + * debian/control + - bumped ocaml deps to 3.08 + - bumped standards-version to 3.6.1.1 + - changed ocaml deps to ocaml-nox + + -- Stefano Zacchiroli Mon, 26 Jul 2004 18:20:53 +0200 + +postgresql-ocaml (1.3.3-1) unstable; urgency=low + + * Initial Release. + + -- Stefano Zacchiroli Tue, 4 May 2004 15:33:22 +0200 --- postgresql-ocaml-1.12.5.orig/debian/rules +++ postgresql-ocaml-1.12.5/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/ocaml.mk + +PKGNAME = libpostgresql-ocaml-dev + +DEB_SRCDIR = $(CURDIR)/lib +DEB_QUILT_TOPDIR = $(CURDIR) +DEB_MAKE_BUILD_TARGET = NO_CUSTOM=y byte-code-library +CFLAGS += -I$(shell pg_config --includedir) -fPIC +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR) + +ifeq ($(OCAML_HAVE_OCAMLOPT),yes) +build/$(PKGNAME):: + $(MAKE) NO_CUSTOM=y -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 --- postgresql-ocaml-1.12.5.orig/debian/control +++ postgresql-ocaml-1.12.5/debian/control @@ -0,0 +1,59 @@ +Source: postgresql-ocaml +Section: ocaml +Priority: optional +Maintainer: Debian OCaml Maintainers +Uploaders: + Stéphane Glondu , + Mehdi Dogguy , + Stefano Zacchiroli +Build-Depends: + debhelper (>= 7), + ocaml-nox (>= 3.11.1-3~), + ocaml-findlib (>= 1.2.5), + libpq-dev, + quilt, + dh-ocaml (>= 0.9), + cdbs +Standards-Version: 3.8.4 +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 +Homepage: http://www.ocaml.info/home/ocaml_sources.html#postgresql-ocaml + +Package: libpostgresql-ocaml-dev +Architecture: any +Depends: + libpq-dev, + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Suggests: ocamlmakefile +Recommends: ocaml-findlib +Description: OCaml bindings to PostgreSQL's libpq + This OCaml-library provides an interface to PostgreSQL, an + efficient and reliable, open source, relational database. + Almost all functionality available through the C-API (libpq) is + replicated in a type-safe way. This library uses objects for + representing database connections and results of queries. + . + This package contains all the development stuff you need to use + OCaml Postgres bindings in your programs. + +Package: libpostgresql-ocaml +Architecture: any +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Provides: ${ocaml:Provides} +Breaks: nurpawiki (<< 1.2.3-2~) +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. + Almost all functionality available through the C-API (libpq) is + replicated in a type-safe way. This library uses objects for + representing database connections and results of queries. + . + This package contains the shared runtime stub libraries and plugins. --- postgresql-ocaml-1.12.5.orig/debian/libpostgresql-ocaml-dev.ocamldoc +++ postgresql-ocaml-1.12.5/debian/libpostgresql-ocaml-dev.ocamldoc @@ -0,0 +1 @@ +# This file must not be empty to be represented in .diff.gz! --- postgresql-ocaml-1.12.5.orig/debian/clean +++ postgresql-ocaml-1.12.5/debian/clean @@ -0,0 +1 @@ +lib/postgresql.cmxs --- postgresql-ocaml-1.12.5.orig/debian/libpostgresql-ocaml-dev.examples +++ postgresql-ocaml-1.12.5/debian/libpostgresql-ocaml-dev.examples @@ -0,0 +1 @@ +examples/* --- postgresql-ocaml-1.12.5.orig/debian/libpostgresql-ocaml.install.in +++ postgresql-ocaml-1.12.5/debian/libpostgresql-ocaml.install.in @@ -0,0 +1,4 @@ +debian/tmp@OCamlStdlibDir@/postgresql/*.so @OCamlDllDir@ +@OCamlStdlibDir@/postgresql/META +@OCamlStdlibDir@/postgresql/*.cma +OPT: lib/postgresql.cmxs @OCamlStdlibDir@/postgresql --- postgresql-ocaml-1.12.5.orig/debian/compat +++ postgresql-ocaml-1.12.5/debian/compat @@ -0,0 +1 @@ +7 --- postgresql-ocaml-1.12.5.orig/debian/README.Debian +++ postgresql-ocaml-1.12.5/debian/README.Debian @@ -0,0 +1,9 @@ +Building PostgtreSQL-OCaml examples +----------------------------------- + +To easily build the examples available in +/usr/share/doc/libpostgresql-ocaml-dev/examples/ you should install +OCamlMakefile which is available in the Debian package "ocamlmakefile", since +the examples' Makefiles reference it. + + -- Stefano Zacchiroli Sat, 29 Dec 2007 23:37:11 +0100 --- postgresql-ocaml-1.12.5.orig/debian/libpostgresql-ocaml-dev.install.in +++ postgresql-ocaml-1.12.5/debian/libpostgresql-ocaml-dev.install.in @@ -0,0 +1,6 @@ +@OCamlStdlibDir@/postgresql/*.cmi +@OCamlStdlibDir@/postgresql/*.mli +@OCamlStdlibDir@/postgresql/lib*.a +OPT: @OCamlStdlibDir@/postgresql/*.a +OPT: @OCamlStdlibDir@/postgresql/*.cmxa +OPT: lib/postgresql.cmx @OCamlStdlibDir@/postgresql --- postgresql-ocaml-1.12.5.orig/debian/libpostgresql-ocaml.dirs.in +++ postgresql-ocaml-1.12.5/debian/libpostgresql-ocaml.dirs.in @@ -0,0 +1 @@ +@OCamlDllDir@ --- postgresql-ocaml-1.12.5.orig/debian/watch +++ postgresql-ocaml-1.12.5/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://ocaml.info/ocaml_sources/postgresql-ocaml-(.*)\.tar\.gz --- postgresql-ocaml-1.12.5.orig/debian/docs +++ postgresql-ocaml-1.12.5/debian/docs @@ -0,0 +1 @@ +README.txt --- postgresql-ocaml-1.12.5.orig/debian/gbp.conf +++ postgresql-ocaml-1.12.5/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True --- postgresql-ocaml-1.12.5.orig/debian/README.source +++ postgresql-ocaml-1.12.5/debian/README.source @@ -0,0 +1,16 @@ +postgresql-ocaml Debian source package +====================================== + +Patching upstream sources +------------------------- + +This source package uses quilt to apply and remove its patches. Please +refer to `/usr/share/doc/quilt/README.source' for information about +how to use quilt for source packages. + +The quilt series is generated from the Git repository, using +dom-{apply,save}-patches, from the dh-ocaml (>= 0.5) package. Please +refer to the appendix about Git in the Debian OCaml Packaging Policy +(from the same package). + + -- Stéphane Glondu , Mon, 7 Sep 2009 09:55:29 +0200 --- postgresql-ocaml-1.12.5.orig/debian/patches/series +++ postgresql-ocaml-1.12.5/debian/patches/series @@ -0,0 +1,3 @@ +0001-DESTDIR-in-Makefiles.patch +0002-Examples.patch +0003-Do-not-link-system-libraries-into-cma.patch --- postgresql-ocaml-1.12.5.orig/debian/patches/0002-Examples.patch +++ postgresql-ocaml-1.12.5/debian/patches/0002-Examples.patch @@ -0,0 +1,109 @@ +From: Stephane Glondu +Date: Mon, 7 Sep 2009 09:48:24 +0200 +Subject: [PATCH] Examples + +Make examples easily buildable in Debian, by relying on +lib dir post-installation (i.e. `ocamlc -where`/postgresql). + +Signed-off-by: Stefano Zacchiroli +Signed-off-by: Stephane Glondu +--- + examples/cursor/Makefile | 4 ++-- + examples/dump/Makefile | 4 ++-- + examples/populate/Makefile | 4 ++-- + examples/prompt/Makefile | 4 ++-- + examples/prompt_gtk/Makefile | 4 ++-- + examples/test_lo/Makefile | 4 ++-- + 6 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/examples/cursor/Makefile b/examples/cursor/Makefile +index 7138b8a..ae61d7f 100644 +--- a/examples/cursor/Makefile ++++ b/examples/cursor/Makefile +@@ -1,8 +1,8 @@ + OCAMLMAKEFILE = ../../OCamlMakefile + + SOURCES = cursor.ml +-INCDIRS = ../../lib +-LIBDIRS = ../../lib ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql + LIBS = postgresql + RESULT = cursor + +diff --git a/examples/dump/Makefile b/examples/dump/Makefile +index e07a1b0..8d4db77 100644 +--- a/examples/dump/Makefile ++++ b/examples/dump/Makefile +@@ -1,8 +1,8 @@ + OCAMLMAKEFILE = ../../OCamlMakefile + + SOURCES = dump.ml +-INCDIRS = ../../lib +-LIBDIRS = ../../lib ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql + LIBS = postgresql + RESULT = dump + +diff --git a/examples/populate/Makefile b/examples/populate/Makefile +index f2674a2..380212e 100644 +--- a/examples/populate/Makefile ++++ b/examples/populate/Makefile +@@ -1,8 +1,8 @@ + OCAMLMAKEFILE = ../../OCamlMakefile + + SOURCES = populate.ml +-INCDIRS = ../../lib +-LIBDIRS = ../../lib ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql + LIBS = postgresql + RESULT = populate + +diff --git a/examples/prompt/Makefile b/examples/prompt/Makefile +index 37e438f..1dbac4e 100644 +--- a/examples/prompt/Makefile ++++ b/examples/prompt/Makefile +@@ -1,8 +1,8 @@ + OCAMLMAKEFILE = ../../OCamlMakefile + + SOURCES = prompt.ml +-INCDIRS = ../../lib +-LIBDIRS = ../../lib ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql + LIBS = postgresql + THREADS = yes + RESULT = prompt +diff --git a/examples/prompt_gtk/Makefile b/examples/prompt_gtk/Makefile +index b24d536..8947bc8 100644 +--- a/examples/prompt_gtk/Makefile ++++ b/examples/prompt_gtk/Makefile +@@ -1,8 +1,8 @@ + OCAMLMAKEFILE = ../../OCamlMakefile + + SOURCES = prompt_gtk.ml +-INCDIRS = ../../lib +-LIBDIRS = ../../lib ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql + LIBS = postgresql + PACKS = lablgtk2 + RESULT = prompt_gtk +diff --git a/examples/test_lo/Makefile b/examples/test_lo/Makefile +index d1441e8..fc46218 100644 +--- a/examples/test_lo/Makefile ++++ b/examples/test_lo/Makefile +@@ -1,8 +1,8 @@ + OCAMLMAKEFILE = ../../OCamlMakefile + + SOURCES = test_lo.ml +-INCDIRS = ../../lib +-LIBDIRS = ../../lib ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql + LIBS = postgresql + RESULT = test_lo + +-- --- postgresql-ocaml-1.12.5.orig/debian/patches/0001-DESTDIR-in-Makefiles.patch +++ postgresql-ocaml-1.12.5/debian/patches/0001-DESTDIR-in-Makefiles.patch @@ -0,0 +1,54 @@ +From: Stephane Glondu +Date: Mon, 7 Sep 2009 09:47:23 +0200 +Subject: [PATCH] DESTDIR in Makefiles + +Enable passing target installation directory from debian/rules. + +Signed-off-by: Stefano Zacchiroli +Signed-off-by: Stephane Glondu +--- + 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 + THREADS = yes ++DESTDIR = ++OCAMLFIND_INSTFLAGS = -ldconf /dev/null -destdir $(DESTDIR) + + all: + +-- --- postgresql-ocaml-1.12.5.orig/debian/patches/0003-Do-not-link-system-libraries-into-cma.patch +++ postgresql-ocaml-1.12.5/debian/patches/0003-Do-not-link-system-libraries-into-cma.patch @@ -0,0 +1,22 @@ +From: Mehdi Dogguy +Date: Tue, 6 Oct 2009 00:22:04 +0200 +Subject: [PATCH] Do not link system libraries into cma + +--- + lib/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/Makefile b/lib/Makefile +index c458f4e..991160c 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -7,7 +7,7 @@ CFLAGS += -O2 -Wall -pedantic -Wno-long-long -fPIC -DPIC + CFLAGS += -DPG_OCAML_MAJOR_VERSION=$(PG_OCAML_MAJOR_VERSION) + CFLAGS += -DPG_OCAML_MINOR_VERSION=$(PG_OCAML_MINOR_VERSION) + CLIBS = pq +-LIBS = threads ++LIBS = + RESULT = postgresql + THREADS = yes + DESTDIR = +--