[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. upstream/1.3-10-g433d0a9

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit 433d0a940a973f8a844c615a8fdc28443fe534d4
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Fri Jun 12 02:35:53 2009 +0200

    Modifying rules to make depend before building.

diff --git a/debian/patches/00list b/debian/patches/00list
index 4de5aa4..34c38ff 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,2 @@
-01_makefile_depend
-02_postgresql_socket
-03_makefile_mli
+01_postgresql_socket
+02_makefile_mli
diff --git a/debian/patches/01_makefile_depend.dpatch b/debian/patches/01_makefile_depend.dpatch
deleted file mode 100755
index a3ad0ab..0000000
--- a/debian/patches/01_makefile_depend.dpatch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile_depend.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-##
-## DP: Including the make depend dependencies in the Makefile.
-
- at DPATCH@
-diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
---- pgocaml-1.3~/Makefile	2009-04-30 19:13:57.000000000 +0200
-+++ pgocaml-1.3/Makefile	2009-06-07 00:33:43.000000000 +0200
-@@ -141,9 +141,14 @@
- 	ocamldep pGOCaml*.ml pGOCaml*.mli > $@
- 	-ocamldep -pp "camlp4o $(FOR_P4) ./pa_pgsql.cmo" >> $@
- 
--ifeq ($(wildcard .depend),.depend)
--include .depend
--endif
-+pGOCaml_config.cmo: 
-+pGOCaml_config.cmx: 
-+pGOCaml_generic.cmo: pGOCaml_config.cmo pGOCaml_generic.cmi 
-+pGOCaml_generic.cmx: pGOCaml_config.cmx pGOCaml_generic.cmi 
-+pGOCaml.cmo: pGOCaml_generic.cmi pGOCaml.cmi 
-+pGOCaml.cmx: pGOCaml_generic.cmx pGOCaml.cmi 
-+pGOCaml_generic.cmi: 
-+pGOCaml.cmi: pGOCaml_generic.cmi
- 
- #
- # Install.
diff --git a/debian/patches/02_postgresql_socket.dpatch b/debian/patches/01_postgresql_socket.dpatch
similarity index 93%
rename from debian/patches/02_postgresql_socket.dpatch
rename to debian/patches/01_postgresql_socket.dpatch
index ac0d4d2..4c83185 100755
--- a/debian/patches/02_postgresql_socket.dpatch
+++ b/debian/patches/01_postgresql_socket.dpatch
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_postgresql_socket.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
+## 01_postgresql_socket.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
 ##
 ## DP: Adapting the postgresql socket for Debian systems.
 
diff --git a/debian/patches/03_makefile_mli.dpatch b/debian/patches/02_makefile_mli.dpatch
similarity index 100%
rename from debian/patches/03_makefile_mli.dpatch
rename to debian/patches/02_makefile_mli.dpatch
diff --git a/debian/rules b/debian/rules
index 9ff6fea..ebbbd36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,3 +37,6 @@ DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR
 OCAML_OCAMLDOC_PACKAGES = libpgocaml-ocaml-dev
 OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package extlib -package pcre -package csv -package calendar
 #OCAML_OCAMLDOC_FLAGS += -I +camlp4
+
+pre-build::
+	make depend

-- 
pgocaml packaging