[Pkg-ocaml-maint-commits] r2027 - in trunk/packages/postgresql-ocaml/trunk/debian: . patches

Stefano Zacchiroli zack at costa.debian.org
Sun Nov 13 11:05:39 UTC 2005 

Author: zack
Date: 2005-11-13 11:05:38 +0000 (Sun, 13 Nov 2005)
New Revision: 2027

Added:
   trunk/packages/postgresql-ocaml/trunk/debian/control.in
   trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml-dev.dirs.in
   trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml.dirs.in
Modified:
   trunk/packages/postgresql-ocaml/trunk/debian/changelog
   trunk/packages/postgresql-ocaml/trunk/debian/control
   trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml-dev.dirs
   trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml.dirs
   trunk/packages/postgresql-ocaml/trunk/debian/patches/01_makefile.dpatch
   trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch
   trunk/packages/postgresql-ocaml/trunk/debian/rules
Log:
3.09 transition


Modified: trunk/packages/postgresql-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/changelog	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/changelog	2005-11-13 11:05:38 UTC (rev 2027)
@@ -1,3 +1,17 @@
+postgresql-ocaml (1.4.6-2) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.09
+  * debian/*
+    - use cdbs
+    - no longer hardcoding of ocaml abi version anywhere
+  * debian/control
+    - bumped standards version
+  * debian/patches/
+    - removed CFLAGS from 01_makefile.dpatch, now set via cdbs
+    - ported 03_examples.dpatch to ocaml 3.09
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 13 Nov 2005 10:24:55 +0000
+
 postgresql-ocaml (1.4.6-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/postgresql-ocaml/trunk/debian/control
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/control	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/control	2005-11-13 11:05:38 UTC (rev 2027)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libpq-dev, ocaml-findlib, ocaml-nox-3.08.3
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), libpq-dev, dpatch, cdbs
+Standards-Version: 3.6.2
 
 Package: libpostgresql-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings to PostgreSQL's libpq
  This OCaml-library provides an interface to PostgreSQL, an
  efficient and reliable, open source, relational database.
@@ -21,7 +21,7 @@
 Package: libpostgresql-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-3.08.3, ocaml-findlib, libpq-dev, libpostgresql-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1), libpq-dev, libpostgresql-ocaml (= ${Source-Version})
 Description: OCaml bindings to PostgreSQL's libpq
  This OCaml-library provides an interface to PostgreSQL, an
  efficient and reliable, open source, relational database.

Added: trunk/packages/postgresql-ocaml/trunk/debian/control.in
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/control.in	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/control.in	2005-11-13 11:05:38 UTC (rev 2027)
@@ -0,0 +1,34 @@
+Source: postgresql-ocaml
+Section: devel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), libpq-dev, dpatch, cdbs
+Standards-Version: 3.6.2
+
+Package: libpostgresql-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings to PostgreSQL's libpq
+ This OCaml-library provides an interface to PostgreSQL, an
+ efficient and reliable, open source, relational database.
+ Almost all functionality available through the C-API (libpq) is
+ replicated in a type-safe way. This library uses objects for
+ representing database connections and results of queries.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libpostgresql-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1), libpq-dev, libpostgresql-ocaml (= ${Source-Version})
+Description: OCaml bindings to PostgreSQL's libpq
+ This OCaml-library provides an interface to PostgreSQL, an
+ efficient and reliable, open source, relational database.
+ Almost all functionality available through the C-API (libpq) is
+ replicated in a type-safe way. This library uses objects for
+ representing database connections and results of queries.
+ .
+ This package contains all the development stuff you need to use
+ OCaml Postgres bindings in your programs.
+

Modified: trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml-dev.dirs
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml-dev.dirs	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml-dev.dirs	2005-11-13 11:05:38 UTC (rev 2027)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3
+usr/lib/ocaml/3.09.0

Added: trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml-dev.dirs.in
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml-dev.dirs.in	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml-dev.dirs.in	2005-11-13 11:05:38 UTC (rev 2027)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@

Modified: trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml.dirs
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml.dirs	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml.dirs	2005-11-13 11:05:38 UTC (rev 2027)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3/stublibs
+usr/lib/ocaml/3.09.0/stublibs

Added: trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml.dirs.in
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml.dirs.in	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/libpostgresql-ocaml.dirs.in	2005-11-13 11:05:38 UTC (rev 2027)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/stublibs

Modified: trunk/packages/postgresql-ocaml/trunk/debian/patches/01_makefile.dpatch
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/patches/01_makefile.dpatch	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/patches/01_makefile.dpatch	2005-11-13 11:05:38 UTC (rev 2027)
@@ -23,14 +23,11 @@
 exit 0
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./lib/Makefile /tmp/dpep-work.8GhWaS/postgresql-ocaml-1.4.6/lib/Makefile
---- ./lib/Makefile	2005-06-13 11:12:44.000000000 +0200
-+++ /tmp/dpep-work.8GhWaS/postgresql-ocaml-1.4.6/lib/Makefile	2005-06-13 11:15:49.620218864 +0200
-@@ -2,8 +2,11 @@
- 
- SOURCES = postgresql.mli postgresql.ml postgresql_stubs.c
+diff -urNad trunk~/lib/Makefile trunk/lib/Makefile
+--- trunk~/lib/Makefile	2005-05-31 16:00:47.000000000 +0000
++++ trunk/lib/Makefile	2005-11-13 10:49:43.000000000 +0000
+@@ -4,6 +4,8 @@
  CFLAGS  = -O2
-+CFLAGS += -I$(shell pg_config --includedir)
  CLIBS   = pq
  RESULT  = postgresql
 +DESTDIR =

Modified: trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch	2005-11-13 11:05:38 UTC (rev 2027)
@@ -33,8 +33,8 @@
  SOURCES = dump.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.08.3/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.08.3/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.0/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.0/postgresql
  LIBS    = postgresql
  RESULT  = dump
  
@@ -48,8 +48,8 @@
  SOURCES = populate.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.08.3/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.08.3/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.0/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.0/postgresql
  LIBS    = postgresql
  RESULT  = populate
  
@@ -63,8 +63,8 @@
  SOURCES = prompt.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.08.3/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.08.3/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.0/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.0/postgresql
  LIBS    = postgresql
  THREADS = yes
  RESULT  = prompt
@@ -78,8 +78,8 @@
  SOURCES = prompt_gtk.ml
 -INCDIRS = ../../lib
 -LIBDIRS = ../../lib
-+INCDIRS = /usr/lib/ocaml/3.08.3/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.08.3/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.0/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.0/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.08.3/postgresql
-+LIBDIRS = /usr/lib/ocaml/3.08.3/postgresql
++INCDIRS = /usr/lib/ocaml/3.09.0/postgresql
++LIBDIRS = /usr/lib/ocaml/3.09.0/postgresql
  LIBS    = postgresql
  RESULT  = test_lo
  

Modified: trunk/packages/postgresql-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/rules	2005-11-13 10:25:01 UTC (rev 2026)
+++ trunk/packages/postgresql-ocaml/trunk/debian/rules	2005-11-13 11:05:38 UTC (rev 2027)
@@ -1,71 +1,37 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-#export DH_VERBOSE=1
+PKGNAME = libpostgresql-ocaml-dev
 
-OCAML_VERSION=3.08.3
-PKG_VERSION=1.3.3
-TARGETDIR=debian/libpostgresql-ocaml-dev/usr/lib/ocaml/$(OCAML_VERSION)
-STUBSDIR=debian/libpostgresql-ocaml/usr/lib/ocaml/$(OCAML_VERSION)/stublibs
+OCAMLABI := $(shell ocamlc -version)
+OCAMLLIBDIR := $(shell ocamlc -where)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DEB_SRCDIR = $(CURDIR)/lib
+DEB_MAKE_BUILD_TARGET = byte-code-library
+CFLAGS += -I$(shell pg_config --includedir)
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+
 BYTE_STUFF="libpostgresql_stubs.a postgresql.cma postgresql.cmi postgresql.mli dllpostgresql_stubs.so"
 
-include /usr/share/dpatch/dpatch.make
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/' $$f.in > $$f; done
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+ifeq ($(HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+	$(MAKE) -C $(DEB_SRCDIR)/ native-code-library
+DEB_MAKE_INSTALL_TARGET = \
+	install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
 else
-	CFLAGS += -O2
+DEB_MAKE_INSTALL_TARGET = \
+	install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR) \
+		LIBINSTALL_FILES=$(BYTE_STUFF)
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+binary-install/$(PKGNAME)::
+	mv $(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)/postgresql/*.so \
+		$(CURDIR)/debian/$(patsubst %-dev,%,$(PKGNAME))$(OCAMLLIBDIR)/stublibs/
 
-build: build-stamp
-build-stamp: patch-stamp 
-	dh_testdir
-	$(MAKE) -C lib/ byte-code-library
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) -C lib/ native-code-library; else true; fi
-	touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	if [ -x /usr/bin/ocamlopt ]; then \
-		$(MAKE) install DESTDIR=$(CURDIR)/$(TARGETDIR)/;	\
-	else	\
-		$(MAKE) install DESTDIR=$(CURDIR)/$(TARGETDIR)/	\
-			LIBINSTALL_FILES=$(BYTE_STUFF);	\
-	fi
-	mv $(TARGETDIR)/postgresql/*.so $(STUBSDIR)/
-
-binary: binary-indep binary-arch
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changes
-	dh_installdocs
-	dh_installexamples
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: build clean binary-indep binary-arch binary install
-
+# work around cdbs' bug
+unpatch: deapply-dpatches

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