[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/3.0.1-1-14-gef9f620

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit e0cf41a4c50cc73c7acc0867440d47e2076a8b36
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Thu Jul 2 18:13:51 2009 +0200

    Update control file et rename doc-base files

diff --git a/debian/control b/debian/control
index 126fd2a..4cf5bd6 100644
--- a/debian/control
+++ b/debian/control
@@ -84,6 +84,7 @@ Architecture: all
 Section: doc
 Suggests: libcamlimages-ocaml-dev
 Depends: ${misc:Depends}
+Conflicts: libcamlimages-ocaml-dev (<< 1:3.0.1-2)
 Description: OCaml CamlImages library documentation
  This package provides documentation for the OCaml CamlImages
  library.
diff --git a/debian/libcamlimages-ocaml-doc-doc.doc-base b/debian/libcamlimages-ocaml-doc.doc-base.doc
similarity index 100%
rename from debian/libcamlimages-ocaml-doc-doc.doc-base
rename to debian/libcamlimages-ocaml-doc.doc-base.doc
diff --git a/debian/libcamlimages-ocaml-doc-html.doc-base b/debian/libcamlimages-ocaml-doc.doc-base.html
similarity index 100%
rename from debian/libcamlimages-ocaml-doc-html.doc-base
rename to debian/libcamlimages-ocaml-doc.doc-base.html
diff --git a/debian/libcamlimages-ocaml-doc.docs b/debian/libcamlimages-ocaml-doc.docs
index 54eaff6..e845566 100644
--- a/debian/libcamlimages-ocaml-doc.docs
+++ b/debian/libcamlimages-ocaml-doc.docs
@@ -1,3 +1 @@
 README
-debian/libcamlimages-ocaml-doc-doc.doc-base
-debian/libcamlimages-ocaml-doc-html.doc-base

-- 
camlimages packaging