[Python-modules-commits] r18494 - in packages/python-docutils/trunk/debian (changelog rules)

[jwilk at users.alioth.debian.org]

    Date: Saturday, September 10, 2011 @ 21:51:07
  Author: jwilk
Revision: 18494

Simplify debian/rules.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/rules

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-09-10 21:11:38 UTC (rev 18493)
+++ packages/python-docutils/trunk/debian/changelog	2011-09-10 21:51:07 UTC (rev 18494)
@@ -4,8 +4,9 @@
     + Install CSS files. Correct paths to them in the *.html files.
     + Don't compress *.txt files in the -doc package.
     + Don't embed images on remote servers.
+  * Simplify debian/rules.
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 10 Sep 2011 23:10:36 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 10 Sep 2011 23:14:37 +0200
 
 python-docutils (0.8.1-1) experimental; urgency=low
 

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2011-09-10 21:11:38 UTC (rev 18493)
+++ packages/python-docutils/trunk/debian/rules	2011-09-10 21:51:07 UTC (rev 18494)
@@ -20,13 +20,6 @@
 	rst2xml \
 	rstpep2html \
 
-p	= python-docutils
-d	= debian/$(p)
-PYTHON	= /usr/bin/python
-
-BUILDHTML_DIRS := .
-BUILDHTML_RECURSE_DIRS := docs
-
 pre_localize_css = 's,href="(([.][.]/)*)docutils/.*/([^/]+[.]css)",href="$$1css/$$3",g;'
 pre_strip_images1 = 's,<img src="http://[^"]+" alt="([^"]*)"[^>]*>,$$1,g;'
 pre_strip_images2 = 's,<img alt="([^"]*)"[^>]*\bsrc="http://[^"]+"[^>]*>,$$1,g;'
@@ -42,7 +35,7 @@
 		exit 1; \
 	fi
 	# Build modules for Python 2.X
-	$(PYTHON) setup.py build
+	python setup.py build
 	# Build modules for Python 3.X in a separate directory
 	rm -rf py3k
 	mkdir py3k
@@ -61,15 +54,12 @@
 	done
 endif
 	# Build documentation:
-	set -ex && for dir in $(BUILDHTML_DIRS); do \
-		PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py \
-			--local --link-stylesheet $$dir \
-			--traceback; \
-	done
-	set -ex && for dir in $(BUILDHTML_RECURSE_DIRS); do \
-		PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py \
-			--link-stylesheet $$dir --traceback; \
-	done
+	PYTHONPATH=.:extras python tools/buildhtml.py \
+		--local --link-stylesheet --traceback \
+		.
+	PYTHONPATH=.:extras python tools/buildhtml.py \
+		--link-stylesheet --traceback \
+		docs
 	( ls *.html && find docs/ -name '*.html' ) \
 	| xargs perl -0777 -p -i -e $(pre_localize_css)$(pre_strip_images)
 	touch build-stamp
@@ -91,7 +81,7 @@
 	dh_testroot
 	dh_installdirs
 	mkdir -p debian/tmp
-	$(PYTHON) setup.py install \
+	python setup.py install \
 	    --root debian/tmp --no-compile $(py_setup_install_args) \
 	    --install-scripts=/usr/share/docutils/scripts/python2/
 	cd py3k && python3 setup.py install \
@@ -120,9 +110,9 @@
 		PYTHONPATH=.:extras; \
 		export PYTHONPATH; \
 		cp debian/$$exe.txt debian/tmp/man/$$exe.txt; \
-		$(PYTHON) debian/tmp/usr/share/docutils/scripts/python2/$$exe --help \
+		python debian/tmp/usr/share/docutils/scripts/python2/$$exe --help \
 			>> debian/tmp/man/$$exe.txt;\
-		$(PYTHON) tools/rst2man.py 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 > \