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

Stephane Glondu steph at glondu.net
Mon Sep 7 08:53:36 UTC 2009 

The following commit has been merged in the master branch:
commit 323c4c7e4c28bb246ca518bb2553179e67d04d53
Author: Stephane Glondu <steph at 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 <glondu at 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 <glondu at 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 <zack at 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 <steph at glondu.net>
+Date: Mon, 7 Sep 2009 09:47:23 +0200
+Subject: [PATCH] DESTDIR in Makefiles
 
- at DPATCH@
-diff -urNad postgresql-ocaml~/OCamlMakefile postgresql-ocaml/OCamlMakefile
---- postgresql-ocaml~/OCamlMakefile	2009-02-22 18:29:27.000000000 +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 <zack at debian.org>
+Signed-off-by: Stephane Glondu <steph at 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.000000000 +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 0000000..14635ad
--- /dev/null
+++ b/debian/patches/0002-Examples.patch
@@ -0,0 +1,109 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Mon, 7 Sep 2009 09:48:24 +0200
+Subject: [PATCH] Examples
+
+Make examples easily buildable in Debian, by relying on
+lib dir post-installation (i.e. `ocamlc -where`/postgresql).
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ examples/cursor/Makefile     |    4 ++--
+ examples/dump/Makefile       |    4 ++--
+ examples/populate/Makefile   |    4 ++--
+ examples/prompt/Makefile     |    4 ++--
+ examples/prompt_gtk/Makefile |    4 ++--
+ examples/test_lo/Makefile    |    4 ++--
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/examples/cursor/Makefile b/examples/cursor/Makefile
+index 7138b8a..ae61d7f 100644
+--- a/examples/cursor/Makefile
++++ b/examples/cursor/Makefile
+@@ -1,8 +1,8 @@
+ OCAMLMAKEFILE = ../../OCamlMakefile
+ 
+ SOURCES = cursor.ml
+-INCDIRS = ../../lib
+-LIBDIRS = ../../lib
++INCDIRS := $(shell ocamlc -where)/postgresql
++LIBDIRS := $(shell ocamlc -where)/postgresql
+ LIBS    = postgresql
+ RESULT  = cursor
+ 
+diff --git a/examples/dump/Makefile b/examples/dump/Makefile
+index e07a1b0..8d4db77 100644
+--- a/examples/dump/Makefile
++++ b/examples/dump/Makefile
+@@ -1,8 +1,8 @@
+ OCAMLMAKEFILE = ../../OCamlMakefile
+ 
+ SOURCES = dump.ml
+-INCDIRS = ../../lib
+-LIBDIRS = ../../lib
++INCDIRS := $(shell ocamlc -where)/postgresql
++LIBDIRS := $(shell ocamlc -where)/postgresql
+ LIBS    = postgresql
+ RESULT  = dump
+ 
+diff --git a/examples/populate/Makefile b/examples/populate/Makefile
+index f2674a2..380212e 100644
+--- a/examples/populate/Makefile
++++ b/examples/populate/Makefile
+@@ -1,8 +1,8 @@
+ OCAMLMAKEFILE = ../../OCamlMakefile
+ 
+ SOURCES = populate.ml
+-INCDIRS = ../../lib
+-LIBDIRS = ../../lib
++INCDIRS := $(shell ocamlc -where)/postgresql
++LIBDIRS := $(shell ocamlc -where)/postgresql
+ LIBS    = postgresql
+ RESULT  = populate
+ 
+diff --git a/examples/prompt/Makefile b/examples/prompt/Makefile
+index 37e438f..1dbac4e 100644
+--- a/examples/prompt/Makefile
++++ b/examples/prompt/Makefile
+@@ -1,8 +1,8 @@
+ OCAMLMAKEFILE = ../../OCamlMakefile
+ 
+ SOURCES = prompt.ml
+-INCDIRS = ../../lib
+-LIBDIRS = ../../lib
++INCDIRS := $(shell ocamlc -where)/postgresql
++LIBDIRS := $(shell ocamlc -where)/postgresql
+ LIBS    = postgresql
+ THREADS = yes
+ RESULT  = prompt
+diff --git a/examples/prompt_gtk/Makefile b/examples/prompt_gtk/Makefile
+index b24d536..8947bc8 100644
+--- a/examples/prompt_gtk/Makefile
++++ b/examples/prompt_gtk/Makefile
+@@ -1,8 +1,8 @@
+ OCAMLMAKEFILE = ../../OCamlMakefile
+ 
+ SOURCES = prompt_gtk.ml
+-INCDIRS = ../../lib
+-LIBDIRS = ../../lib
++INCDIRS := $(shell ocamlc -where)/postgresql
++LIBDIRS := $(shell ocamlc -where)/postgresql
+ LIBS    = postgresql
+ PACKS   = lablgtk2
+ RESULT  = prompt_gtk
+diff --git a/examples/test_lo/Makefile b/examples/test_lo/Makefile
+index d1441e8..fc46218 100644
+--- a/examples/test_lo/Makefile
++++ b/examples/test_lo/Makefile
+@@ -1,8 +1,8 @@
+ OCAMLMAKEFILE = ../../OCamlMakefile
+ 
+ SOURCES = test_lo.ml
+-INCDIRS = ../../lib
+-LIBDIRS = ../../lib
++INCDIRS := $(shell ocamlc -where)/postgresql
++LIBDIRS := $(shell ocamlc -where)/postgresql
+ LIBS    = postgresql
+ RESULT  = test_lo
+ 
+-- 
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index c2409be..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../upstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9706487..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-install_destdir.dpatch
-examples.dpatch
diff --git a/debian/patches/examples.dpatch b/debian/patches/examples.dpatch
deleted file mode 100755
index 7b4fb2c..0000000
--- a/debian/patches/examples.dpatch
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 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, by relying on
-## DP: lib dir post-installation (i.e. `ocamlc -where`/postgresql)
-
- at DPATCH@
-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
- 
- SOURCES = cursor.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
-+INCDIRS := $(shell ocamlc -where)/postgresql
-+LIBDIRS := $(shell ocamlc -where)/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
--LIBDIRS = ../../lib
-+INCDIRS := $(shell ocamlc -where)/postgresql
-+LIBDIRS := $(shell ocamlc -where)/postgresql
- LIBS    = postgresql
- RESULT  = dump
- 
-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
- 
- SOURCES = populate.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
-+INCDIRS := $(shell ocamlc -where)/postgresql
-+LIBDIRS := $(shell ocamlc -where)/postgresql
- LIBS    = postgresql
- RESULT  = populate
- 
-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
- 
- SOURCES = prompt.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
-+INCDIRS := $(shell ocamlc -where)/postgresql
-+LIBDIRS := $(shell ocamlc -where)/postgresql
- LIBS    = postgresql
- THREADS = yes
- RESULT  = prompt
-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
- 
- SOURCES = prompt_gtk.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
-+INCDIRS := $(shell ocamlc -where)/postgresql
-+LIBDIRS := $(shell ocamlc -where)/postgresql
- LIBS    = postgresql
- 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
- 
- SOURCES = test_lo.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
-+INCDIRS := $(shell ocamlc -where)/postgresql
-+LIBDIRS := $(shell ocamlc -where)/postgresql
- LIBS    = postgresql
- RESULT  = test_lo
- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d213c46
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-DESTDIR-in-Makefiles.patch
+0002-Examples.patch
diff --git a/debian/rules b/debian/rules
index 6162074..7f9f9ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
 PKGNAME = libpostgresql-ocaml-dev
 
 OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
 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)

-- 
postgresql-ocaml packaging

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