[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.10.3-1-13-gd72a362

2009-09-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 0d3eb5217e7a4fe375707c056dd929a0f482bfe0
Merge: 1c9bd047e196634fa3c39769449bcc3d416ef45a 
31d7b64b0cd1c696ac5e32f3ed1a328a2fdbf30a
Author: Stephane Glondu st...@glondu.net
Date:   Mon Sep 7 09:31:54 2009 +0200

Merge commit 'upstream/1.11.1'


-- 
postgresql-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.10.3-1-13-gd72a362

2009-09-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 63e43b09183b10809de47584c1b7d518065041f7
Author: Stephane Glondu st...@glondu.net
Date:   Mon Sep 7 09:43:35 2009 +0200

Add debian/gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True

-- 
postgresql-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.10.3-1-13-gd72a362

2009-09-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 323c4c7e4c28bb246ca518bb2553179e67d04d53
Author: Stephane Glondu st...@glondu.net
Date:   Mon Sep 7 09:56:00 2009 +0200

Switch patches to quilt and refresh them

diff --git a/debian/README.source b/debian/README.source
index 86a77aa..bea1552 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,16 @@
-This package uses dpatch for patching the source.
+postgresql-ocaml Debian source package
+==
 
-Please consider reading dpatch manpage to patch the source.
+Patching upstream sources
+-
 
- -- Stéphane Glondu glo...@debian.org, Mon,  7 Sep 2009 09:20:25 +0200
+This source package uses quilt to apply and remove its patches. Please
+refer to `/usr/share/doc/quilt/README.source' for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (= 0.5) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
+
+ -- Stéphane Glondu glo...@debian.org, Mon,  7 Sep 2009 09:55:29 +0200
diff --git a/debian/changelog b/debian/changelog
index 15670c2..4826f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ postgresql-ocaml (1.11.1-1) UNRELEASED; urgency=low
 
   [ Stéphane Glondu ]
   * New Upstream Version
+  * Switch patches to quilt
   * Add README.source
   * debian/control:
 - add versioned Breaks to nurpawiki because of binary incompatibility
diff --git a/debian/control b/debian/control
index a0fc24e..c508c9a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  ocaml-nox (= 3.11),
  ocaml-findlib (= 1.2.4),
  libpq-dev,
- dpatch,
+ quilt,
  dh-ocaml (= 0.4),
  cdbs
 Standards-Version: 3.8.3
diff --git a/debian/patches/install_destdir.dpatch 
b/debian/patches/0001-DESTDIR-in-Makefiles.patch
old mode 100755
new mode 100644
similarity index 56%
rename from debian/patches/install_destdir.dpatch
rename to debian/patches/0001-DESTDIR-in-Makefiles.patch
index 2f636be..3de94c9
--- a/debian/patches/install_destdir.dpatch
+++ b/debian/patches/0001-DESTDIR-in-Makefiles.patch
@@ -1,14 +1,21 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.dpatch by Stefano Zacchiroli z...@debian.org
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: enable passing target installation directory from debian/rules
+From: Stephane Glondu st...@glondu.net
+Date: Mon, 7 Sep 2009 09:47:23 +0200
+Subject: [PATCH] DESTDIR in Makefiles
 
-...@dpatch@
-diff -urNad postgresql-ocaml~/OCamlMakefile postgresql-ocaml/OCamlMakefile
 postgresql-ocaml~/OCamlMakefile2009-02-22 18:29:27.0 +0100
-+++ postgresql-ocaml/OCamlMakefile 2009-02-22 19:11:12.017209853 +0100
-@@ -1178,12 +1178,14 @@
+Enable passing target installation directory from debian/rules.
+
+Signed-off-by: Stefano Zacchiroli z...@debian.org
+Signed-off-by: Stephane Glondu st...@glondu.net
+---
+ OCamlMakefile |3 +++
+ lib/Makefile  |2 ++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/OCamlMakefile b/OCamlMakefile
+index b8898ad..2ba893d 100644
+--- a/OCamlMakefile
 b/OCamlMakefile
+@@ -1211,12 +1211,14 @@ subprojs: $(SUBPROJS:%=subproj_%)
  .PHONY: libinstall
  libinstall:   all
$(QUIET)printf \nInstalling library with ocamlfind\n
@@ -23,7 +30,7 @@ diff -urNad postgresql-ocaml~/OCamlMakefile 
postgresql-ocaml/OCamlMakefile
$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
$(QUIET)printf \nInstallation successful.\n
-@@ -1191,6 +1193,7 @@
+@@ -1224,6 +1226,7 @@ libinstall-byte-code:all
  .PHONY: libinstall-native-code
  libinstall-native-code:   all
$(QUIET)printf \nInstalling native-code library with ocamlfind\n
@@ -31,15 +38,17 @@ diff -urNad postgresql-ocaml~/OCamlMakefile 
postgresql-ocaml/OCamlMakefile
$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
  $(filter-out $(DLLSONAME) $(RESULT).cma, $(LIBINSTALL_FILES))
$(QUIET)printf \nInstallation successful.\n
-diff -urNad postgresql-ocaml~/lib/Makefile postgresql-ocaml/lib/Makefile
 postgresql-ocaml~/lib/Makefile 2009-02-22 19:10:07.0 +0100
-+++ postgresql-ocaml/lib/Makefile  2009-02-22 19:10:26.361237441 +0100
-@@ -8,6 +8,8 @@
- CFLAGS += -DPG_OCAML_MINOR_VERSION=$(PG_OCAML_MINOR_VERSION)
- CLIBS   = pq
+diff --git a/lib/Makefile b/lib/Makefile
+index 008e028..c458f4e 100644
+--- a/lib/Makefile
 b/lib/Makefile
+@@ -10,6 +10,8 @@ CLIBS   = pq
+ LIBS= threads
  RESULT  = postgresql
+ THREADS = yes
 +DESTDIR =
 +OCAMLFIND_INSTFLAGS = -ldconf /dev/null -destdir $(DESTDIR)
  
  all:
  
+-- 
diff --git a/debian/patches/0002-Examples.patch 
b/debian/patches/0002-Examples.patch
new file mode 100644
index

[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.10.3-1-13-gd72a362

2009-09-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 351717f703c3f5d6bdc05f16bf75c5c5960cc6d5
Author: Stephane Glondu st...@glondu.net
Date:   Mon Sep 7 10:15:09 2009 +0200

Fix (some) Lintian informational tags

diff --git a/debian/control b/debian/control
index c508c9a..274787d 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Breaks: nurpawiki ( 1.2.2-5~)
-Description: OCaml bindings to PostgreSQL's libpq
+Description: OCaml bindings to PostgreSQL's libpq (runtime)
  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
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 3a56cc3..000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-postgresql-ocaml source: dpatch-index-references-non-existant-patch 
examples.dpatch

-- 
postgresql-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.10.3-1-13-gd72a362

2009-09-07 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit d72a362c4d90aed3f6c7925ebc1d5d90c0cdb463
Author: Stephane Glondu st...@glondu.net
Date:   Mon Sep 7 10:24:01 2009 +0200

Build native plugin, install plugins in libpostgresql-ocaml

diff --git a/debian/changelog b/debian/changelog
index 4826f6b..16b3811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ postgresql-ocaml (1.11.1-1) UNRELEASED; urgency=low
 - add myself to Uploaders
 - move to section ocaml
 - update Standards-Version to 3.8.3
+  * Build native plugin, install plugins in libpostgresql-ocaml
 
   [ Stefano Zacchiroli ]
   * debian/copyright: snip away unnecessary details (which also contained
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000..1468c5d
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+lib/postgresql.cmxs
diff --git a/debian/control b/debian/control
index 274787d..6643f3e 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Breaks: nurpawiki ( 1.2.2-5~)
+Replaces: libpostgresql-ocaml-dev ( 1.11.1)
+Conflicts: libpostgresql-ocaml-dev ( 1.11.1)
 Description: OCaml bindings to PostgreSQL's libpq (runtime)
  This OCaml-library provides an interface to PostgreSQL, an
  efficient and reliable, open source, relational database.
diff --git a/debian/libpostgresql-ocaml-dev.install.in 
b/debian/libpostgresql-ocaml-dev.install.in
new file mode 100644
index 000..99505d1
--- /dev/null
+++ b/debian/libpostgresql-ocaml-dev.install.in
@@ -0,0 +1,6 @@
+...@ocamlstdlibdir@/postgresql/*.cmi
+...@ocamlstdlibdir@/postgresql/*.mli
+...@ocamlstdlibdir@/postgresql/lib*.a
+OPT: @OCamlStdlibDir@/postgresql/*.a
+OPT: @OCamlStdlibDir@/postgresql/*.cmxa
+OPT: lib/postgresql.cmx @OCamlStdlibDir@/postgresql
diff --git a/debian/libpostgresql-ocaml.install.in 
b/debian/libpostgresql-ocaml.install.in
new file mode 100644
index 000..580061f
--- /dev/null
+++ b/debian/libpostgresql-ocaml.install.in
@@ -0,0 +1,4 @@
+debian/t...@ocamlstdlibdir@/postgresql/*.so @OCamlDllDir@
+...@ocamlstdlibdir@/postgresql/META
+...@ocamlstdlibdir@/postgresql/*.cma
+OPT: lib/postgresql.cmxs @OCamlStdlibDir@/postgresql
diff --git a/debian/rules b/debian/rules
index 7f9f9ac..a65e9b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,17 +11,14 @@ DEB_SRCDIR = $(CURDIR)/lib
 DEB_QUILT_TOPDIR = $(CURDIR)
 DEB_MAKE_BUILD_TARGET = byte-code-library
 CFLAGS += -I$(shell pg_config --includedir) -fPIC
-DEB_MAKE_INSTALL_TARGET = install 
DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)
+DEB_MAKE_INSTALL_TARGET = install 
DESTDIR=$(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
$(MAKE) -C $(DEB_SRCDIR)/ native-code-library
+   cd $(DEB_SRCDIR)  ocamlopt -shared -I . -o postgresql.cmxs -linkall 
postgresql.cmxa
 endif
 
 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)$(OCAML_STDLIB_DIR)/postgresql/*.so \
-   $(CURDIR)/debian/$(patsubst 
%-dev,%,$(PKGNAME))$(OCAML_STDLIB_DIR)/stublibs/

-- 
postgresql-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits