[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.7.0-3-21-gc411d48

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 5a5a7677949556dc09940c6998de165566f98202
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Feb 22 19:17:27 2009 +0100

    install_destdir.dpatch: delegate mkdir to make rather than dh_*

diff --git a/debian/changelog b/debian/changelog
index 216998c..a46c5c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ postgresql-ocaml (1.10.3-1) UNRELEASED; urgency=low
     - clean up obsolete dpatch headers and use dpatch-run
     - examples.dpatch: remove the .in need, invoking ocamlc -where at
       make-time to find the stdlib dir
+    - install_destdir.dpatch: delegate mkdir to make rather than dh_*
   * bump debhelper compatibility level to 7
 
   [ Stephane Glondu ]
diff --git a/debian/libpostgresql-ocaml-dev.dirs.in b/debian/libpostgresql-ocaml-dev.dirs.in
deleted file mode 100644
index cc51687..0000000
--- a/debian/libpostgresql-ocaml-dev.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlStdlibDir@
diff --git a/debian/patches/install_destdir.dpatch b/debian/patches/install_destdir.dpatch
index 95ce479..2f636be 100755
--- a/debian/patches/install_destdir.dpatch
+++ b/debian/patches/install_destdir.dpatch
@@ -5,11 +5,37 @@
 ## DP: enable passing target installation directory from debian/rules
 
 @DPATCH@
-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
+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 @@
+ .PHONY: libinstall
+ libinstall:	all
+ 	$(QUIET)printf "\nInstalling library with ocamlfind\n"
++	test -d $(DESTDIR) || mkdir -p $(DESTDIR)
+ 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
+ 	$(QUIET)printf "\nInstallation successful.\n"
+ 
+ .PHONY: libinstall-byte-code
+ libinstall-byte-code:	all
+ 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
++	test -d $(DESTDIR) || mkdir -p $(DESTDIR)
+ 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
+ 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
+ 	$(QUIET)printf "\nInstallation successful.\n"
+@@ -1191,6 +1193,7 @@
+ .PHONY: libinstall-native-code
+ libinstall-native-code:	all
+ 	$(QUIET)printf "\nInstalling native-code library with ocamlfind\n"
++	test -d $(DESTDIR) || mkdir -p $(DESTDIR)
+ 	$(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
  RESULT  = postgresql
 +DESTDIR =

-- 
postgresql-ocaml packaging