[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.7.0-3-18-g17fd15e

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit c81eb7b8a98d78b3c72a0590996105be091a82c1
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Feb 22 18:36:36 2009 +0100

    avoid stdlib assumption in some patches

diff --git a/debian/changelog b/debian/changelog
index 0f89d8e..92e22f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ postgresql-ocaml (1.10.3-1) UNRELEASED; urgency=low
     - 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/*.dirs.in: use explicit substitution variables instead of
+  * debian/*.in: use explicit substitution variables instead of
     making assumption on stdlib dir location
   * bump debhelper compatibility level to 7
 
diff --git a/debian/patches/examples.dpatch.in b/debian/patches/examples.dpatch.in
index f8c886e..72be773 100644
--- a/debian/patches/examples.dpatch.in
+++ b/debian/patches/examples.dpatch.in
@@ -33,8 +33,8 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
  SOURCES = dump.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
-+LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++INCDIRS = @OCamlStdlibDir@/postgresql
++LIBDIRS = @OCamlStdlibDir@/postgresql
  LIBS    = postgresql
  RESULT  = dump
  
@@ -48,8 +48,8 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
  SOURCES = populate.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
-+LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++INCDIRS = @OCamlStdlibDir@/postgresql
++LIBDIRS = @OCamlStdlibDir@/postgresql
  LIBS    = postgresql
  RESULT  = populate
  
@@ -63,8 +63,8 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
  SOURCES = prompt.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
-+LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++INCDIRS = @OCamlStdlibDir@/postgresql
++LIBDIRS = @OCamlStdlibDir@/postgresql
  LIBS    = postgresql
  THREADS = yes
  RESULT  = prompt
@@ -78,8 +78,8 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
  SOURCES = prompt_gtk.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
-+LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++INCDIRS = @OCamlStdlibDir@/postgresql
++LIBDIRS = @OCamlStdlibDir@/postgresql
  LIBS    = postgresql
  PACKS   = lablgtk
  OCAMLBLDFLAGS = gtkInit.cmo
@@ -93,8 +93,8 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
  SOURCES = test_lo.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
-+LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++INCDIRS = @OCamlStdlibDir@/postgresql
++LIBDIRS = @OCamlStdlibDir@/postgresql
  LIBS    = postgresql
  RESULT  = test_lo
  

-- 
postgresql-ocaml packaging