The following commit has been merged in the master branch: commit c6f4d0d2d1712587b6c430acebd9846274d55473 Author: Stefano Zacchiroli <z...@upsilon.cc> Date: Sun Feb 22 19:03:27 2009 +0100
turn examples in a non-.in patch (using ocamlc -where) diff --git a/debian/changelog b/debian/changelog index c7116c9..216998c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,8 @@ postgresql-ocaml (1.10.3-1) UNRELEASED; urgency=low making assumption on stdlib dir location * debian/patches/ - clean up obsolete dpatch headers and use dpatch-run - - examples.dpatch.in: refresh + - examples.dpatch: remove the .in need, invoking ocamlc -where at + make-time to find the stdlib dir * bump debhelper compatibility level to 7 [ Stephane Glondu ] diff --git a/debian/patches/examples.dpatch.in b/debian/patches/examples.dpatch similarity index 84% rename from debian/patches/examples.dpatch.in rename to debian/patches/examples.dpatch index 5b046a5..7b4fb2c 100755 --- a/debian/patches/examples.dpatch.in +++ b/debian/patches/examples.dpatch @@ -15,8 +15,8 @@ diff -urNad postgresql-ocaml~/examples/cursor/Makefile postgresql-ocaml/examples SOURCES = cursor.ml -INCDIRS = ../../lib -LIBDIRS = ../../lib -+INCDIRS = @OCamlStdlibDir@/postgresql -+LIBDIRS = @OCamlStdlibDir@/postgresql ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql LIBS = postgresql RESULT = cursor @@ -29,8 +29,8 @@ diff -urNad postgresql-ocaml~/examples/dump/Makefile postgresql-ocaml/examples/d SOURCES = dump.ml -INCDIRS = ../../lib -LIBDIRS = ../../lib -+INCDIRS = @OCamlStdlibDir@/postgresql -+LIBDIRS = @OCamlStdlibDir@/postgresql ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql LIBS = postgresql RESULT = dump @@ -43,8 +43,8 @@ diff -urNad postgresql-ocaml~/examples/populate/Makefile postgresql-ocaml/exampl SOURCES = populate.ml -INCDIRS = ../../lib -LIBDIRS = ../../lib -+INCDIRS = @OCamlStdlibDir@/postgresql -+LIBDIRS = @OCamlStdlibDir@/postgresql ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql LIBS = postgresql RESULT = populate @@ -57,8 +57,8 @@ diff -urNad postgresql-ocaml~/examples/prompt/Makefile postgresql-ocaml/examples SOURCES = prompt.ml -INCDIRS = ../../lib -LIBDIRS = ../../lib -+INCDIRS = @OCamlStdlibDir@/postgresql -+LIBDIRS = @OCamlStdlibDir@/postgresql ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql LIBS = postgresql THREADS = yes RESULT = prompt @@ -71,8 +71,8 @@ diff -urNad postgresql-ocaml~/examples/prompt_gtk/Makefile postgresql-ocaml/exam SOURCES = prompt_gtk.ml -INCDIRS = ../../lib -LIBDIRS = ../../lib -+INCDIRS = @OCamlStdlibDir@/postgresql -+LIBDIRS = @OCamlStdlibDir@/postgresql ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql LIBS = postgresql PACKS = lablgtk2 RESULT = prompt_gtk @@ -85,8 +85,8 @@ diff -urNad postgresql-ocaml~/examples/test_lo/Makefile postgresql-ocaml/example SOURCES = test_lo.ml -INCDIRS = ../../lib -LIBDIRS = ../../lib -+INCDIRS = @OCamlStdlibDir@/postgresql -+LIBDIRS = @OCamlStdlibDir@/postgresql ++INCDIRS := $(shell ocamlc -where)/postgresql ++LIBDIRS := $(shell ocamlc -where)/postgresql LIBS = postgresql RESULT = test_lo diff --git a/debian/rules b/debian/rules index 57a10be..6162074 100755 --- a/debian/rules +++ b/debian/rules @@ -6,9 +6,6 @@ include /usr/share/cdbs/1/rules/ocaml.mk PKGNAME = libpostgresql-ocaml-dev - # The examples patch needs to be patched since it contains hard coded ABI - # numbers. -OCAML_IN_FILES += debian/patches/examples.dpatch OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES) DEB_SRCDIR = $(CURDIR)/lib DEB_MAKE_BUILD_TARGET = byte-code-library -- postgresql-ocaml packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits