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

Sun Feb 22 17:49:11 UTC 2009

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

    examples.dpatch.in: refresh

diff --git a/debian/changelog b/debian/changelog
index c5cffe1..c7116c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,9 @@ postgresql-ocaml (1.10.3-1) UNRELEASED; urgency=low
   * 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
+  * debian/patches/
+    - clean up obsolete dpatch headers and use dpatch-run
+    - examples.dpatch.in: refresh
   * bump debhelper compatibility level to 7
 
   [ Stephane Glondu ]
diff --git a/debian/patches/examples.dpatch.in b/debian/patches/examples.dpatch.in
old mode 100644
new mode 100755
index 62991ab..5b046a5
--- a/debian/patches/examples.dpatch.in
+++ b/debian/patches/examples.dpatch.in
@@ -1,16 +1,30 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_examples.dpatch by Stefano Zacchiroli <zack at debian.org>
+## examples.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: make examples easily buildable in Debian
+## DP: make examples easily buildable in Debian, by relying on
+## DP: lib dir post-installation (i.e. `ocamlc -where`/postgresql)
 
 @DPATCH@
-diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/dump/Makefile postgresql-ocaml-1.3.3/examples/dump/Makefile
---- /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/dump/Makefile	2004-01-28 18:14:59.000000000 +0100
-+++ postgresql-ocaml-1.3.3/examples/dump/Makefile	2004-05-04 16:40:33.057062192 +0200
+diff -urNad postgresql-ocaml~/examples/cursor/Makefile postgresql-ocaml/examples/cursor/Makefile
+--- postgresql-ocaml~/examples/cursor/Makefile	2009-01-16 17:08:36.000000000 +0100
++++ postgresql-ocaml/examples/cursor/Makefile	2009-02-22 18:41:31.561208654 +0100
 @@ -1,8 +1,8 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
+ OCAMLMAKEFILE = ../../OCamlMakefile
+ 
+ SOURCES = cursor.ml
+-INCDIRS = ../../lib
+-LIBDIRS = ../../lib
++INCDIRS = @OCamlStdlibDir@/postgresql
++LIBDIRS = @OCamlStdlibDir@/postgresql
+ LIBS    = postgresql
+ RESULT  = cursor
+ 
+diff -urNad postgresql-ocaml~/examples/dump/Makefile postgresql-ocaml/examples/dump/Makefile
+--- postgresql-ocaml~/examples/dump/Makefile	2009-01-16 17:08:36.000000000 +0100
++++ postgresql-ocaml/examples/dump/Makefile	2009-02-22 18:41:39.945209629 +0100
+@@ -1,8 +1,8 @@
+ OCAMLMAKEFILE = ../../OCamlMakefile
  
  SOURCES = dump.ml
 -INCDIRS = ../../lib
@@ -20,12 +34,11 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
  LIBS    = postgresql
  RESULT  = dump
  
-diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/populate/Makefile postgresql-ocaml-1.3.3/examples/populate/Makefile
---- /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/populate/Makefile	2004-01-28 18:15:00.000000000 +0100
-+++ postgresql-ocaml-1.3.3/examples/populate/Makefile	2004-05-04 16:40:36.453545848 +0200
+diff -urNad postgresql-ocaml~/examples/populate/Makefile postgresql-ocaml/examples/populate/Makefile
+--- postgresql-ocaml~/examples/populate/Makefile	2009-01-16 17:08:36.000000000 +0100
++++ postgresql-ocaml/examples/populate/Makefile	2009-02-22 18:41:44.121209514 +0100
 @@ -1,8 +1,8 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
+ OCAMLMAKEFILE = ../../OCamlMakefile
  
  SOURCES = populate.ml
 -INCDIRS = ../../lib
@@ -35,12 +48,11 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
  LIBS    = postgresql
  RESULT  = populate
  
-diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/prompt/Makefile postgresql-ocaml-1.3.3/examples/prompt/Makefile
---- /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/prompt/Makefile	2004-01-28 18:15:00.000000000 +0100
-+++ postgresql-ocaml-1.3.3/examples/prompt/Makefile	2004-05-04 16:40:43.732439288 +0200
+diff -urNad postgresql-ocaml~/examples/prompt/Makefile postgresql-ocaml/examples/prompt/Makefile
+--- postgresql-ocaml~/examples/prompt/Makefile	2009-01-16 17:08:36.000000000 +0100
++++ postgresql-ocaml/examples/prompt/Makefile	2009-02-22 18:41:52.746218906 +0100
 @@ -1,8 +1,8 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
+ OCAMLMAKEFILE = ../../OCamlMakefile
  
  SOURCES = prompt.ml
 -INCDIRS = ../../lib
@@ -50,12 +62,11 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
  LIBS    = postgresql
  THREADS = yes
  RESULT  = prompt
-diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/prompt_gtk/Makefile postgresql-ocaml-1.3.3/examples/prompt_gtk/Makefile
---- /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/prompt_gtk/Makefile	2004-01-28 18:15:00.000000000 +0100
-+++ postgresql-ocaml-1.3.3/examples/prompt_gtk/Makefile	2004-05-04 16:40:40.384948184 +0200
+diff -urNad postgresql-ocaml~/examples/prompt_gtk/Makefile postgresql-ocaml/examples/prompt_gtk/Makefile
+--- postgresql-ocaml~/examples/prompt_gtk/Makefile	2009-01-16 17:08:36.000000000 +0100
++++ postgresql-ocaml/examples/prompt_gtk/Makefile	2009-02-22 18:41:48.262846594 +0100
 @@ -1,8 +1,8 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
+ OCAMLMAKEFILE = ../../OCamlMakefile
  
  SOURCES = prompt_gtk.ml
 -INCDIRS = ../../lib
@@ -63,14 +74,13 @@ diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.
 +INCDIRS = @OCamlStdlibDir@/postgresql
 +LIBDIRS = @OCamlStdlibDir@/postgresql
  LIBS    = postgresql
- PACKS   = lablgtk
- OCAMLBLDFLAGS = gtkInit.cmo
-diff -urNad /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/test_lo/Makefile postgresql-ocaml-1.3.3/examples/test_lo/Makefile
---- /home/zack/dati/debian/packages/postgresql-ocaml/postgresql-ocaml-1.3.3/examples/test_lo/Makefile	2004-01-28 18:15:00.000000000 +0100
-+++ postgresql-ocaml-1.3.3/examples/test_lo/Makefile	2004-05-04 16:40:48.574703152 +0200
+ PACKS   = lablgtk2
+ RESULT  = prompt_gtk
+diff -urNad postgresql-ocaml~/examples/test_lo/Makefile postgresql-ocaml/examples/test_lo/Makefile
+--- postgresql-ocaml~/examples/test_lo/Makefile	2009-01-16 17:08:36.000000000 +0100
++++ postgresql-ocaml/examples/test_lo/Makefile	2009-02-22 18:41:56.381209944 +0100
 @@ -1,8 +1,8 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
+ OCAMLMAKEFILE = ../../OCamlMakefile
  
  SOURCES = test_lo.ml
 -INCDIRS = ../../lib

-- 
postgresql-ocaml packaging

