[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. debian/1.3-2-1-ga72bc98

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a72bc9802dcc829a2ecacd326675a58726e69e33
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Nov 16 09:36:58 2009 +0100

    Fix for #556419
    
    - Make libpgocaml-ocaml Conflicts/Replaces with libpgocaml-ocaml-dev
    - Do not install META and pgocaml.cma in libpgocaml-ocaml-dev

diff --git a/debian/changelog b/debian/changelog
index 7610ce0..f338219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pgocaml (1.3-3) unstable; urgency=low
+
+  * Do not install META and pgocaml.cma in libpgocaml-ocaml-dev
+    (Closes: #556419).
+  * Make libpgocaml-ocaml Conflicts/Replaces with libpgocaml-ocaml-dev
+    to be sure that the conflicting files get removed before installing
+    libpgocaml-ocaml.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 16 Nov 2009 09:32:24 +0100
+
 pgocaml (1.3-2) unstable; urgency=low
 
   [ Sylvain Le Gall ]
diff --git a/debian/control b/debian/control
index 7411f1d..825502d 100644
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,8 @@ Depends: libpcre-ocaml,
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Suggests: postgresql (>= 7.4)
+Conflicts: libpgocaml-ocaml-dev (<< 1.3-3)
+Replaces: libpgocaml-ocaml-dev (<< 1.3-3)
 Description: OCaml type-safe bindings for PostgreSQL
  PG'OCaml provides an interface to PostgreSQL databases for OCaml applications.
  It uses Camlp4 to extend the OCaml syntax, enabling one to directly embed SQL
diff --git a/debian/rules b/debian/rules
index e8d2361..870e447 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,10 @@ DEB_MAKE_BUILD_TARGET   := all_byte
 DEB_MAKE_INSTALL_TARGET := install_byte DESTDIR=debian/libpgocaml-ocaml-dev/
 endif
 
+binary-install/libpgocaml-ocaml-dev::
+	rm -f debian/libpgocaml-ocaml-dev/$(OCAML_STDLIB_DIR)/pgocaml/META
+	rm -f debian/libpgocaml-ocaml-dev/$(OCAML_STDLIB_DIR)/pgocaml/pgocaml.cma
+
 pre-build::
 	make depend
 	if ! test -f pGOCaml_config.ml.orig; then \

-- 
pgocaml packaging