[Pkg-ocaml-maint-commits] r2787 - in /trunk/packages/postgresql-ocaml/trunk/debian: changelog patches/03_examples.dpatch patches/03_examples.dpatch.in rules

zack at users.alioth.debian.org zack at users.alioth.debian.org
Sat May 27 10:03:56 UTC 2006 

Author: zack
Date: Sat May 27 10:03:55 2006
New Revision: 2787

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2787
Log:
upload to unstable

Added:
    trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch.in
      - copied, changed from r2715, trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch
Modified:
    trunk/packages/postgresql-ocaml/trunk/debian/changelog
    trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch
    trunk/packages/postgresql-ocaml/trunk/debian/rules

Modified: trunk/packages/postgresql-ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/changelog?rev=2787&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/changelog Sat May 27 10:03:55 2006
@@ -1,3 +1,11 @@
+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 <zack at debian.org>  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.

Modified: trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch?rev=2787&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch Sat May 27 10:03:55 2006
@@ -33,8 +33,8 @@
  SOURCES = dump.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.2/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.2/postgresql
  LIBS    = postgresql
  RESULT  = dump
  
@@ -48,8 +48,8 @@
  SOURCES = populate.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.2/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.2/postgresql
  LIBS    = postgresql
  RESULT  = populate
  
@@ -63,8 +63,8 @@
  SOURCES = prompt.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.2/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.2/postgresql
  LIBS    = postgresql
  THREADS = yes
  RESULT  = prompt
@@ -78,8 +78,8 @@
  SOURCES = prompt_gtk.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.2/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.2/postgresql
  LIBS    = postgresql
  PACKS   = lablgtk
  OCAMLBLDFLAGS = gtkInit.cmo
@@ -93,8 +93,8 @@
  SOURCES = test_lo.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.2/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.2/postgresql
  LIBS    = postgresql
  RESULT  = test_lo
  

Copied: trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch.in (from r2715, trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch.in?rev=2787&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch.in Sat May 27 10:03:55 2006
@@ -33,8 +33,8 @@
  SOURCES = dump.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
  LIBS    = postgresql
  RESULT  = dump
  
@@ -48,8 +48,8 @@
  SOURCES = populate.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
  LIBS    = postgresql
  RESULT  = populate
  
@@ -63,8 +63,8 @@
  SOURCES = prompt.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
  LIBS    = postgresql
  THREADS = yes
  RESULT  = prompt
@@ -78,8 +78,8 @@
  SOURCES = prompt_gtk.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
  LIBS    = postgresql
  PACKS   = lablgtk
  OCAMLBLDFLAGS = gtkInit.cmo
@@ -93,8 +93,8 @@
  SOURCES = test_lo.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.09.1/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.09.1/postgresql
++INCDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
++LIBDIRS = /usr/lib/ocaml/@OCamlABI@/postgresql
  LIBS    = postgresql
  RESULT  = test_lo
  

Modified: trunk/packages/postgresql-ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/rules?rev=2787&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/rules (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/rules Sat May 27 10:03:55 2006
@@ -7,7 +7,7 @@
 
 OCAMLABI := $(shell ocamlc -version)
 OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in debian/patches/*.in))
 HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
 DEB_SRCDIR = $(CURDIR)/lib
 DEB_MAKE_BUILD_TARGET = byte-code-library

More information about the Pkg-ocaml-maint-commits mailing list