Correct symlinks.

diff --git a/debian/changelog b/debian/changelog
index a74c73029436d9d7cc96ec1083be2345d4865d6e..b19cb48166bb4f40d4d17e8fbc1dbb6daa2e4577 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 ocaml (3.09.2-6) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-  * Corrected symbolic links in documentation directories.
+  * Correct /usr/include/caml symbolic link.
+  * Correct symbolic links in documentation directories.
 
  -- Samuel Mimram <smimram@debian.org>  Sun, 18 Jun 2006 11:47:08 +0000
 

diff --git a/debian/ocaml-base-nox.docs b/debian/ocaml-base-nox.docs
index ae141cf713b5bd7b2a9501ea5e0fbde5b82b0e1c..a444502fe8ca7cb48f2b9f9681bd573a54716bd8 100644 (file)
--- a/debian/ocaml-base-nox.docs
+++ b/debian/ocaml-base-nox.docs
@@ -1,4 +1,4 @@
 Changes
 README
 debian/policy/ocaml_packaging_policy
-debian/policy/ocaml_packaging_policy-html
+debian/policy/ocaml_packaging_policy.html

diff --git a/debian/policy/Makefile b/debian/policy/Makefile
index 29f1347e0a5b93d8ea30d814c9fae30ef2e5c765..e8c3e1189af2be5e67014568ed0bbac7378ac49b 100644 (file)
--- a/debian/policy/Makefile
+++ b/debian/policy/Makefile
@@ -1,13 +1,13 @@
 all: html text
 
 html:
-       docbook2html ocaml_packaging_policy.xml -o ocaml_packaging_policy-html
+       docbook2html ocaml_packaging_policy.xml -o ocaml_packaging_policy.html
 
 text:
        docbook2txt ocaml_packaging_policy.xml
        mv ocaml_packaging_policy.txt ocaml_packaging_policy
 
 clean:
-       $(RM) -rf ocaml_packaging_policy-html ocaml_packaging_policy
+       $(RM) -rf ocaml_packaging_policy.html ocaml_packaging_policy
 
 .PHONY: html text

diff --git a/debian/rules b/debian/rules
index fcf4c0e00e6470f8a6d06a0549bdf12bd1a5cbee..f7b3d19978e3687fdd64b5ead51d1b2ab775f537 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -242,7 +242,7 @@ install-arch: build-arch
        rm -f debian/ocaml-nox/usr/share/man/man1/*.opt.1
 
        # make some symbolic links
-       cd debian/ocaml-nox/usr/include; ln -sf /usr/lib/ocaml/$(ocamlabi)/caml .
+       cd debian/ocaml-nox/usr/include; ln -sf /usr/lib/ocaml/$(OCAMLABI)/caml .
        cd debian/ocaml-native-compilers/usr/share/man/man1; \
                ln -sf /usr/share/man/man1/ocamlc.1.gz ocamlc.opt.1.gz; \
                ln -sf /usr/share/man/man1/ocamlopt.1.gz ocamlopt.opt.1.gz; \
@@ -256,19 +256,19 @@ install-arch: build-arch
                ln -sf ../ocaml-base-nox/README.gz .; \
                ln -sf ../ocaml-base-nox/README.Debian .; \
                ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
-               ln -sf ../ocaml-base-nox/ocaml_packaging_policy-html .
+               ln -sf ../ocaml-base-nox/ocaml_packaging_policy.html .
        cd debian/ocaml-nox/usr/share/doc/ocaml-nox; \
                ln -sf ../ocaml-base-nox/Changes.gz .; \
                ln -sf ../ocaml-base-nox/README.gz .; \
                ln -sf ../ocaml-base-nox/README.Debian .; \
                ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
-               ln -sf ../ocaml-base-nox/ocaml_packaging_policy-html .
+               ln -sf ../ocaml-base-nox/ocaml_packaging_policy.html .
        cd debian/ocaml-base/usr/share/doc/ocaml-base; \
                ln -sf ../ocaml-base-nox/Changes.gz .; \
                ln -sf ../ocaml-base-nox/README.gz .; \
                ln -sf ../ocaml-base-nox/README.Debian .; \
                ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz .; \
-               ln -sf ../ocaml-base-nox/ocaml_packaging_policy-html .
+               ln -sf ../ocaml-base-nox/ocaml_packaging_policy.html .
 
        dh_install -a