* debian/ocaml-base-nox.README.Debian

  - add an entry describing the requirement for compiling ocamldoc-generated
    LaTeX documentation (closes: #420782)

diff --git a/debian/changelog b/debian/changelog
index 5697b3ac515b886e6b8c52cb37d632b99d9806ad..90132ffe11e1c9d26cd94997a535f784c13072f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,9 @@ ocaml (3.10.0-8) UNRELEASED; urgency=low
       likely to generate empty API references ...)
     - add support for automatic generation of doc-base entries for ocamldoc
       generated API reference
-  * debian ocaml-nox.README.Debian
-    - add Debian specific README for ocaml-nox, describing the requirement for
-      compiling ocamldoc-generated LaTeX documentation (closes: #420782)
+  * debian/ocaml-base-nox.README.Debian
+    - add an entry describing the requirement for compiling ocamldoc-generated
+      LaTeX documentation (closes: #420782)
 
  -- Stefano Zacchiroli <zack@debian.org>  Sun, 02 Sep 2007 18:22:41 +0200
 

diff --git a/debian/ocaml-base-nox.README.Debian b/debian/ocaml-base-nox.README.Debian
index 114913e323afbf3589829cae52e0c25699f7bb04..802c9beef35a33bf6ff2ce2befff4d60b95790d3 100644 (file)
--- a/debian/ocaml-base-nox.README.Debian
+++ b/debian/ocaml-base-nox.README.Debian
@@ -1,16 +1,6 @@
 ocaml for Debian
 ----------------
 
-  WARNING !!!
-
-  If you installed this package, and all of a sudden your bytecode program
-  stopped working, then you need to upgrade your ocaml library packages (the
-  libfoo-ocaml ones) to packages rebuilt using ocaml (>= 3.06-13). Normally
-  you should not have been able to upgrade ocaml to 3.06-13 or later if such
-  libraries are still installed on your system, but Bug#170825 in dpkg allowed
-  you to upgrade ocaml without checking that the virtual dependencies are
-  still provided. 
-
   1) The ocaml package has been split into different binary packages :
 
   o ocaml : contains the full ocaml suite
@@ -51,3 +41,16 @@ ocaml for Debian
   /usr/lib/ocaml/<ocaml_version>/stublibs.
 
  -- Jerome Marant <jerome@debian.org>, Sat Aug 20 11:51:32 2005
+
+ocamldoc's LaTeX output
+-----------------------
+
+ocamldoc can generated documentation in LaTeX format which can be later on
+compiled using a LaTeX environment. The LaTeX sources generated by ocamldoc
+exploits the fullpage.sty style, which is not included in a default texlive
+installation (the Debian LaTeX environment of choice).
+
+In order to be able to compile ocamldoc generated LaTeX sources you will need
+to install the "texlive-latex-extra" package.
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 02 Sep 2007 18:22:14 +0200

diff --git a/debian/ocaml-nox.README.Debian b/debian/ocaml-nox.README.Debian
deleted file mode 100644 (file)
index 33c13db..0000000
--- a/debian/ocaml-nox.README.Debian
+++ /dev/null
@@ -1,12 +0,0 @@
-ocamldoc's LaTeX output
-====
-
-ocamldoc can generated documentation in LaTeX format which can be later on
-compiled using a LaTeX environment. The LaTeX sources generated by ocamldoc
-exploits the fullpage.sty style, which is not included in a default texlive
-installation (the Debian LaTeX environment of choice).
-
-In order to be able to compile ocamldoc generated LaTeX sources you will need
-to install the "texlive-latex-extra" package.
-
- -- Stefano Zacchiroli <zack@debian.org>  Sun, 02 Sep 2007 18:22:14 +0200