[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. debian/1.3-3-9-g7779ae2

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit c42a45b22c6b82ce71e6694087641e386db1ba42
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Mon Feb 22 14:26:02 2010 +0100

    Adapted patches to 1.4 release.

diff --git a/debian/patches/01_postgresql_socket b/debian/patches/01_postgresql_socket
old mode 100755
new mode 100644
index 4c83185..0da1988
--- a/debian/patches/01_postgresql_socket
+++ b/debian/patches/01_postgresql_socket
@@ -4,10 +4,9 @@
 ## DP: Adapting the postgresql socket for Debian systems.
 
 @DPATCH@
-diff -urNad pgocaml-1.3~/Makefile.config pgocaml-1.3/Makefile.config
---- pgocaml-1.3~/Makefile.config	2009-06-01 13:07:28.000000000 +0200
-+++ pgocaml-1.3/Makefile.config		2009-06-09 15:47:17.000000000 +0200
-@@ -9,8 +9,8 @@
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -24,8 +24,8 @@
  # Default location for Unix domain socket directory.  If the auto-detection
  # does not work on your system, please set this variable manually.
  
diff --git a/debian/patches/02_makefile_mli b/debian/patches/02_makefile_mli
deleted file mode 100755
index 322975e..0000000
--- a/debian/patches/02_makefile_mli
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_makefile_mli.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-##
-## DP: Including .mli files for documentation generation.
-
- at DPATCH@
-diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
---- pgocaml-1.3~/Makefile	2009-06-09 15:31:01.000000000 +0200
-+++ pgocaml-1.3/Makefile	2009-06-09 15:31:49.000000000 +0200
-@@ -155,7 +155,7 @@
- #
- 
- findlib_install:
--	ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa pGOCaml_generic.cm[ix] pGOCaml.cm[ix] pa_pgsql.cmo
-+	ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa pGOCaml_generic.cm[ix] pGOCaml.cm[ix] pa_pgsql.cmo pGOCaml_generic.mli pGOCaml.mli
- 
- reinstall:
- 	ocamlfind remove $(PACKAGE)
diff --git a/debian/patches/series b/debian/patches/series
index c3d9b96..30105b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_postgresql_socket
-02_makefile_mli
 03_makefile_cmxs
 04_makefile_byte

-- 
pgocaml packaging