[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20070918-2-29-ga53147c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit a53147cd7e9b7a5bf5e470d2598a62c5b01b289c
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Mar 9 13:36:17 2009 +0100

    Put doc in cameleon-doc

diff --git a/debian/cameleon-doc.install b/debian/cameleon-doc.install
new file mode 100644
index 0000000..11719cf
--- /dev/null
+++ b/debian/cameleon-doc.install
@@ -0,0 +1 @@
+src/ocamldoc/*       /usr/share/doc/cameleon-doc/html/api/
diff --git a/debian/cameleon-doc.links b/debian/cameleon-doc.links
new file mode 100644
index 0000000..9597a59
--- /dev/null
+++ b/debian/cameleon-doc.links
@@ -0,0 +1 @@
+usr/share/doc/cameleon-doc/html       usr/share/doc/libcameleon-ocaml-doc/html
diff --git a/debian/changelog b/debian/changelog
index 63009a9..e63c66c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,11 +17,12 @@ cameleon (1.9.18.svn20090302+691-1) UNRELEASED; urgency=low
   * Use ocaml.mk as a CDBS "rules" file
   * Switch copyright to machine-parsable format
   * Add Lintian overrides for bytecode executables
+  * Move doc to cameleon-doc
 
   [ Mehdi Dogguy ]
   * Fix a typo in description of libcameleon-ocaml-dev
 
- -- Stephane Glondu <steph at glondu.net>  Mon, 09 Mar 2009 00:49:12 +0100
+ -- Stephane Glondu <steph at glondu.net>  Mon, 09 Mar 2009 14:05:18 +0100
 
 cameleon (1.9.18.svn20070918-2) unstable; urgency=low
 
diff --git a/debian/libcameleon-ocaml-dev.install.in b/debian/libcameleon-ocaml-dev.install.in
index 4d60405..2abbd97 100644
--- a/debian/libcameleon-ocaml-dev.install.in
+++ b/debian/libcameleon-ocaml-dev.install.in
@@ -1,2 +1 @@
 debian/META.cameleon @OCamlStdlibDir@/METAS/
-src/ocamldoc/*       /usr/share/doc/libcameleon-ocaml-dev/html/api/
diff --git a/debian/rules b/debian/rules
index 1152e25..54a3914 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
 
 CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.11.0-5),$(CDBS_BUILD_DEPENDS))
 
-OCAML_OCAMLDOC_PACKAGES_DOCBASE := libcameleon-ocaml-dev
+OCAML_OCAMLDOC_PACKAGES_DOCBASE := cameleon-doc
 
 # These cannot be erased by debian/clean mechanisms becore they are touched
 # by upstream `make clean'

-- 
cameleon packaging