added .txt extension to the textual version of the policy

diff --git a/debian/changelog b/debian/changelog
index f520b4d597c591ec5c19af01b99663d92b7d833b..88ee7021a3a4c01882882b4d287333f6ccc53ef6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ocaml (3.09.3~rc1-1) experimental; urgency=low
       debian/control of OCaml related packages
     - fixed typo in the suggested debian/rules line to fill the OFILES
       variable
+  * Added .txt suffix to the textual version of the policy
 
   [ Samuel Mimram ]
   * Updated policy (section 2.3) to explain how to add a conditional

diff --git a/debian/ocaml-base-nox.docs b/debian/ocaml-base-nox.docs
index a444502fe8ca7cb48f2b9f9681bd573a54716bd8..59e02396586630b09f7a4d47002d18e8d0d6c99f 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.txt
 debian/policy/ocaml_packaging_policy.html

diff --git a/debian/policy/Makefile b/debian/policy/Makefile
index 24e0b3447ca08dd45f87a47260ed76d9c1525d99..08bc6c7c49976277122a6ef0a16df0c172396fd6 100644 (file)
--- a/debian/policy/Makefile
+++ b/debian/policy/Makefile
@@ -1,14 +1,15 @@
 all: html text
 
-html:
-       docbook2html ocaml_packaging_policy.xml -o ocaml_packaging_policy.html
+html: ocaml_packaging_policy.html/index.html
+text: ocaml_packaging_policy.txt
 
-text:
-       docbook2txt ocaml_packaging_policy.xml
-       mv ocaml_packaging_policy.txt ocaml_packaging_policy
+ocaml_packaging_policy.html/index.html: ocaml_packaging_policy.xml *.xml
+       docbook2html $< -o $(dir $@)
+ocaml_packaging_policy.txt: ocaml_packaging_policy.xml *.xml
+       docbook2txt $<
 
 clean:
-       $(RM) -rf ocaml_packaging_policy.html ocaml_packaging_policy
+       $(RM) -rf ocaml_packaging_policy.html/ ocaml_packaging_policy.txt
 
 upload_web: all
        scp -rC ocaml_packaging_policy ocaml_packaging_policy.html alioth.debian.org:/org/alioth.debian.org/chroot/home/groups/pkg-ocaml-maint/htdocs/

diff --git a/debian/rules b/debian/rules
index fe656d71974043f9ea82512a6256c8321e5f4ca2..5a2958913b580bea1e9101021f3064055e8481f5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -254,19 +254,19 @@ install-arch: build-arch
                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.txt.gz .; \
                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.txt.gz .; \
                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.txt.gz .; \
                ln -sf ../ocaml-base-nox/ocaml_packaging_policy.html .
 
        dh_install -a