[Pkg-ocaml-maint-commits] r3148 - in /trunk/packages/ocaml/trunk/debian: changelog ocaml-base-nox.docs policy/ policy/Makefile rules

[zack at users.alioth.debian.org]

Author: zack
Date: Sat Sep 16 11:29:06 2006
New Revision: 3148

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3148
Log:
added .txt extension to the textual version of the policy

Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs
    trunk/packages/ocaml/trunk/debian/policy/   (props changed)
    trunk/packages/ocaml/trunk/debian/policy/Makefile
    trunk/packages/ocaml/trunk/debian/rules

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=3148&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Sat Sep 16 11:29:06 2006
@@ -9,6 +9,7 @@
       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

Modified: trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs?rev=3148&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs Sat Sep 16 11:29:06 2006
@@ -1,4 +1,4 @@
 Changes
 README
-debian/policy/ocaml_packaging_policy
+debian/policy/ocaml_packaging_policy.txt
 debian/policy/ocaml_packaging_policy.html

Propchange: trunk/packages/ocaml/trunk/debian/policy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 16 11:29:06 2006
@@ -1,0 +1,2 @@
+ocaml_packaging_policy.html
+ocaml_packaging_policy.txt

Modified: trunk/packages/ocaml/trunk/debian/policy/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/policy/Makefile?rev=3148&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/policy/Makefile (original)
+++ trunk/packages/ocaml/trunk/debian/policy/Makefile Sat Sep 16 11:29:06 2006
@@ -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/

Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=3148&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Sat Sep 16 11:29:06 2006
@@ -254,19 +254,19 @@
 		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