[Pkg-ocaml-maint-commits] r3168 - in /trunk/packages/postgresql-ocaml/trunk/debian: changelog control rules

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Sep 17 14:29:52 2006
New Revision: 3168

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3168
Log:
use ocaml.mk, ready for 3.09.3

Modified:
    trunk/packages/postgresql-ocaml/trunk/debian/changelog
    trunk/packages/postgresql-ocaml/trunk/debian/control
    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=3168&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/changelog Sun Sep 17 14:29:52 2006
@@ -1,3 +1,13 @@
+postgresql-ocaml (1.5.4-2) UNRELEASED; urgency=low
+
+  * debian/rules
+    - use ocaml.mk
+  * debian/control
+    - bumped build dependency on ocaml-nox to >= 3.09.3, since we now use
+      ocaml.mk
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 17 Sep 2006 16:26:05 +0200
+
 postgresql-ocaml (1.5.4-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/postgresql-ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/control?rev=3168&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/control (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/control Sun Sep 17 14:29:52 2006
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.1), libpq-dev, dpatch, cdbs
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.3), ocaml-findlib (>= 1.1), libpq-dev, dpatch, cdbs
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml
 

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=3168&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/rules (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/rules Sun Sep 17 14:29:52 2006
@@ -2,22 +2,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
 PKGNAME = libpostgresql-ocaml-dev
 
-OCAMLABI := $(shell ocamlc -version)
-OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-makebuilddir/$(PKGNAME):: ocamlinit
-
  # The examples patch needs to be patched since it contains hard coded ABI
  # numbers.
-OFILES += debian/patches/03_examples.dpatch
+OCAML_IN_FILES += debian/patches/03_examples.dpatch
 
  # Since dpatch fails to deapply if a patch is not there we need to
  # instantiate the patch before cleaning.
@@ -26,17 +17,17 @@
 DEB_SRCDIR = $(CURDIR)/lib
 DEB_MAKE_BUILD_TARGET = byte-code-library
 CFLAGS += -I$(shell pg_config --includedir) -fPIC
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
 
-ifeq ($(HAVE_OCAMLOPT),yes)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) -C $(DEB_SRCDIR)/ native-code-library
 endif
 
-ifneq ($(HAVE_OCAMLOPT),yes)
+ifneq ($(OCAML_HAVE_OCAMLOPT),yes)
 export LIBINSTALL_FILES = libpostgresql_stubs.a postgresql.cma postgresql.cmi postgresql.mli dllpostgresql_stubs.so
 endif
 
 binary-install/$(PKGNAME)::
-	mv $(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)/postgresql/*.so \
-		$(CURDIR)/debian/$(patsubst %-dev,%,$(PKGNAME))$(OCAMLLIBDIR)/stublibs/
+	mv $(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)/postgresql/*.so \
+		$(CURDIR)/debian/$(patsubst %-dev,%,$(PKGNAME))$(OCAML_STDLIB_DIR)/stublibs/