[Python-modules-commits] r17324 - in packages/python-docutils/trunk/debian (7 files)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Mon Jun 6 22:54:56 UTC 2011 

    Date: Monday, June 6, 2011 @ 22:54:55
  Author: jwilk
Revision: 17324

Build scripts for both 2.X and 3.X. Use a different directory for temporary manpages location.

Added:
  packages/python-docutils/trunk/debian/python-docutils.docs
  packages/python-docutils/trunk/debian/python3-docutils.docs
Modified:
  packages/python-docutils/trunk/debian/docutils-doc.docs
  packages/python-docutils/trunk/debian/python-docutils.install
  packages/python-docutils/trunk/debian/python-docutils.manpages
  packages/python-docutils/trunk/debian/python3-docutils.install
  packages/python-docutils/trunk/debian/rules

Modified: packages/python-docutils/trunk/debian/docutils-doc.docs
===================================================================
--- packages/python-docutils/trunk/debian/docutils-doc.docs	2011-06-06 22:44:27 UTC (rev 17323)
+++ packages/python-docutils/trunk/debian/docutils-doc.docs	2011-06-06 22:54:55 UTC (rev 17324)
@@ -1 +1,3 @@
 docs/
+*.txt
+*.html

Added: packages/python-docutils/trunk/debian/python-docutils.docs
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.docs	                        (rev 0)
+++ packages/python-docutils/trunk/debian/python-docutils.docs	2011-06-06 22:54:55 UTC (rev 17324)
@@ -0,0 +1 @@
+*.txt

Modified: packages/python-docutils/trunk/debian/python-docutils.install
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.install	2011-06-06 22:44:27 UTC (rev 17323)
+++ packages/python-docutils/trunk/debian/python-docutils.install	2011-06-06 22:54:55 UTC (rev 17324)
@@ -1,3 +1,3 @@
-/usr/bin/*
+/usr/share/docutils/scripts/python2/*
 /usr/lib/python2.*/*-packages/docutils*.egg-info
 /usr/lib/python2.*/*-packages/docutils

Modified: packages/python-docutils/trunk/debian/python-docutils.manpages
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.manpages	2011-06-06 22:44:27 UTC (rev 17323)
+++ packages/python-docutils/trunk/debian/python-docutils.manpages	2011-06-06 22:54:55 UTC (rev 17324)
@@ -1,11 +1,11 @@
-debian/man.tmp/rst2html.1
-debian/man.tmp/rst2xml.1
-debian/man.tmp/rst2latex.1
-debian/man.tmp/rst2man.1
-debian/man.tmp/rst2newlatex.1
-debian/man.tmp/rst2odt.1
-debian/man.tmp/rst2odt_prepstyles.1
-debian/man.tmp/rst2pseudoxml.1
-debian/man.tmp/rst2s5.1
-debian/man.tmp/rstpep2html.1
-debian/man.tmp/rst-buildhtml.1
+debian/tmp/man/rst2html.1
+debian/tmp/man/rst2xml.1
+debian/tmp/man/rst2latex.1
+debian/tmp/man/rst2man.1
+debian/tmp/man/rst2newlatex.1
+debian/tmp/man/rst2odt.1
+debian/tmp/man/rst2odt_prepstyles.1
+debian/tmp/man/rst2pseudoxml.1
+debian/tmp/man/rst2s5.1
+debian/tmp/man/rstpep2html.1
+debian/tmp/man/rst-buildhtml.1

Added: packages/python-docutils/trunk/debian/python3-docutils.docs
===================================================================
--- packages/python-docutils/trunk/debian/python3-docutils.docs	                        (rev 0)
+++ packages/python-docutils/trunk/debian/python3-docutils.docs	2011-06-06 22:54:55 UTC (rev 17324)
@@ -0,0 +1 @@
+*.txt

Modified: packages/python-docutils/trunk/debian/python3-docutils.install
===================================================================
--- packages/python-docutils/trunk/debian/python3-docutils.install	2011-06-06 22:44:27 UTC (rev 17323)
+++ packages/python-docutils/trunk/debian/python3-docutils.install	2011-06-06 22:54:55 UTC (rev 17324)
@@ -1,2 +1,3 @@
+/usr/share/docutils/scripts/python3/*
 /usr/lib/python3/dist-packages/docutils*.egg-info
 /usr/lib/python3/dist-packages/docutils

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2011-06-06 22:44:27 UTC (rev 17323)
+++ packages/python-docutils/trunk/debian/rules	2011-06-06 22:54:55 UTC (rev 17324)
@@ -7,6 +7,19 @@
 
 -include /usr/share/python/python.mk
 
+scripts = \
+	rst-buildhtml \
+	rst2html \
+	rst2latex \
+	rst2man \
+	rst2newlatex \
+	rst2odt \
+	rst2odt_prepstyles \
+	rst2pseudoxml \
+	rst2s5 \
+	rst2xml \
+	rstpep2html \
+
 p	= python-docutils
 d	= debian/$(p)
 PYTHON	= /usr/bin/python
@@ -56,7 +69,6 @@
 	rm -rf build/ py3k/
 	find -name '*.py[co]' -delete
 	rm -f *.html
-	rm -rf debian/man.tmp
 	find docs -name '*.html' -not -name 'quickref.html' -delete
 	rm -rf docutils.egg-info extras/docutils.egg-info
 	cd test && rm -rf alltests.out record.txt functional/output/*/ functional/output/[a-z]*.*
@@ -68,46 +80,41 @@
 	dh_installdirs
 	mkdir -p debian/tmp
 	$(PYTHON) setup.py install \
-	    --root debian/tmp --no-compile $(py_setup_install_args)
+	    --root debian/tmp --no-compile $(py_setup_install_args) \
+	    --install-scripts=/usr/share/docutils/scripts/python2/
 	cd py3k && python3 setup.py install \
-	    --root ../debian/tmp --no-compile $(py_setup_install_args)
+	    --root ../debian/tmp --no-compile $(py_setup_install_args) \
+	    --install-scripts=/usr/share/docutils/scripts/python3/
 	# Move data files outside dist-packages:
 	mkdir -p debian/tmp/usr/share/
-	rm -rf debian/tmp/usr/share/docutils/
-	cp -rl debian/tmp/usr/lib/python2.*/*-packages/docutils debian/tmp/usr/share/
+	cp -rlf debian/tmp/usr/lib/python2.*/*-packages/docutils debian/tmp/usr/share/
 	find debian/tmp/usr/lib/python[23]*/*-packages/docutils/ -type f '!' -name '*.py' -delete
-	find debian/tmp/usr/share/docutils/ -type f -name '*.py' -delete
+	find debian/tmp/usr/share/docutils/ -name scripts -name '*.py' '!' -path '*/scripts/*' -delete
 	find debian/tmp/ -type d -empty -delete
 	sed -i -e 's/^\(_debian_package\) = /\1 = 1/' debian/tmp/usr/lib/python[23]*/*-packages/docutils/__init__.py
-	: # give scripts canonical names in /usr/bin
-	cd debian/tmp/usr/bin && \
-	mv rst2newlatex.py rst2newlatex && \
-	mv rst2html.py rst2html && \
-	mv rst2xml.py rst2xml && \
-	mv rst2s5.py rst2s5 && \
-	mv rst2pseudoxml.py rst2pseudoxml && \
-	mv rstpep2html.py rstpep2html && \
-	mv rst2odt.py rst2odt && \
-	mv rst2odt_prepstyles.py rst2odt_prepstyles && \
-	mv rst2man.py rst2man && \
-	mv rst2latex.py rst2latex
-	install tools/buildhtml.py debian/tmp/usr/bin/rst-buildhtml
+	# Give scripts canonical names
+	mkdir -p debian/tmp/usr/share/docutils/scripts/python2/
+	set -e && for python in python2 python3; do \
+		dir=debian/tmp/usr/share/docutils/scripts/$$python/; \
+		for exe in $(filter-out rst-buildhtml,$(scripts)); do \
+			mv $$dir/$$exe.py $$dir/$$exe; \
+		done; \
+	done
+	install tools/buildhtml.py debian/tmp/usr/share/docutils/scripts/python2/rst-buildhtml
 	: # Make the man pages (we want to do this *after* renaming all the
 	: # tools, because their executable name goes into the --help output)
-	install -d debian/man.tmp
-	set -e && for exe in rst2html rst2man rst2latex rst2newlatex \
-		rst2pseudoxml rst2s5 rst2xml rst-buildhtml rstpep2html \
-		rst2odt; do \
+	mkdir -p debian/tmp/man/
+	set -e && for exe in $(filter-out rst2odt_prepstyles,$(scripts)); do \
 		PYTHONPATH=.:extras; \
 		export PYTHONPATH; \
-		cp debian/$$exe.txt debian/man.tmp/$$exe.txt; \
-		$(PYTHON) debian/tmp/usr/bin/$$exe --help \
-			>> debian/man.tmp/$$exe.txt;\
-		$(PYTHON) tools/rst2man.py debian/man.tmp/$$exe.txt \
-			debian/man.tmp/$$exe.1; \
+		cp debian/$$exe.txt debian/tmp/man/$$exe.txt; \
+		$(PYTHON) debian/tmp/usr/share/docutils/scripts/python2/$$exe --help \
+			>> debian/tmp/man/$$exe.txt;\
+		$(PYTHON) tools/rst2man.py debian/tmp/man/$$exe.txt \
+			debian/tmp/man/$$exe.1; \
 	done
 	docbook-to-man debian/rst2odt_prepstyles.sgml > \
-		debian/man.tmp/rst2odt_prepstyles.1
+		debian/tmp/man/rst2odt_prepstyles.1
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -117,7 +124,8 @@
 	dh_installdocs -p docutils-doc *.txt *.html -XCOPYING
 	mkdir -p debian/docutils-doc/usr/share/doc/python-docutils/
 	cd debian/docutils-doc/usr/share/doc/python-docutils/ && ln -sf ../docutils-doc/*.html .
-	dh_install -i
+	dh_install -p docutils-common -X /scripts/
+	dh_install -N docutils-common
 	dh_lintian
 	dh_pysupport -p python-docutils -p python-roman
 	dh_python3 -p python3-docutils -p python3-roman

More information about the Python-modules-commits mailing list