[Python-modules-commits] r18882 - in packages/sphinx/branches/1.1/debian (changelog rules)

Wed Oct 12 18:07:18 UTC 2011

Date: Wednesday, October 12, 2011 @ 18:07:15
  Author: jwilk
Revision: 18882

Merge 1.0 -> 1.1.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/rules

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================

--- packages/sphinx/branches/1.1/debian/changelog	2011-10-12 17:56:48 UTC (rev 18881)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-12 18:07:15 UTC (rev 18882)
@@ -6,7 +6,6 @@
     + Rename disable_ez_setup.diff to disable_distribute_setup.diff.
     + Refresh other patches.
     + Update integration tests for the JavaScript code.
-    + Update versions in the manual pages.
     + Bump minimum required versions:
       - python-docutils to >= 0.7;
       - python-pygments to >= 1.2;
@@ -17,8 +16,12 @@
   * Texinfo output format is now supported (closes: #586747).
   * Update version numbers in the manual pages. Add a build-time warning to be
     emitted if they ever get out of date again.
+  * Refactor the code responsible for moving data into a private directory.
+    Rename some variables to make them lowercase. Don't use CURDIR where it's
+    not necessary.
+  * Run nosetests with --verbose --no-skip.
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 12 Oct 2011 11:31:23 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 12 Oct 2011 19:54:37 +0200
 
 sphinx (1.0.8+dfsg-2) unstable; urgency=low
 

Modified: packages/sphinx/branches/1.1/debian/rules
===================================================================
--- packages/sphinx/branches/1.1/debian/rules	2011-10-12 17:56:48 UTC (rev 18881)
+++ packages/sphinx/branches/1.1/debian/rules	2011-10-12 18:07:15 UTC (rev 18882)
@@ -10,10 +10,8 @@
 upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
 upstream_version = $(firstword $(subst +, ,$(debian_version)))
 
-PACKAGE_NAME=python-sphinx
-PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME)
-SITE_PACKAGES_DIR=$(PACKAGE_DIR)$(call py_libdir,$(shell pyversions -d))
-
+debroot = debian/python-sphinx/
+site_packages = $(call py_libdir,$(shell pyversions -d))
 javascript_path = /usr/share/javascript/sphinxdoc/1.0/
 
 build-arch:
@@ -29,7 +27,7 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e -x; \
 	for python in $(shell pyversions -r); do \
-		$$python tests/run.py; \
+		$$python tests/run.py --verbose --no-skip; \
 	done
 	xvfb-run ./debian/jstest/run-tests
 endif
@@ -47,37 +45,40 @@
 	dh_testdir
 	dh_testroot
 	dh_installdirs
-	python setup.py install --no-compile --install-layout=deb --root $(PACKAGE_DIR)
+	python setup.py install --no-compile --install-layout=deb --root $(debroot)
 	# move static files outside {site,dist}-packages
-	mv $(SITE_PACKAGES_DIR)/sphinx/texinputs $(PACKAGE_DIR)/usr/share/sphinx/
-	mv $(SITE_PACKAGES_DIR)/sphinx/themes $(PACKAGE_DIR)/usr/share/sphinx/
-	mv $(SITE_PACKAGES_DIR)/sphinx/pycode/Grammar.txt $(PACKAGE_DIR)/usr/share/sphinx/pycode/
-	cp sphinx/pycode/Grammar.pickle $(PACKAGE_DIR)/usr/share/sphinx/pycode/
-	mv $(SITE_PACKAGES_DIR)/sphinx/ext/autosummary/templates $(PACKAGE_DIR)/usr/share/sphinx/ext/autosummary/
+	cd $(debroot) && mv -t usr/share/sphinx/ .$(site_packages)/sphinx/texinputs \
+		.$(site_packages)/sphinx/themes
+	cd $(debroot) && mv -t usr/share/sphinx/pycode/ \
+		.$(site_packages)/sphinx/pycode/Grammar.txt
+	cp -t $(debroot)/usr/share/sphinx/pycode/ sphinx/pycode/Grammar.pickle
+	cd $(debroot) && mv -t usr/share/sphinx/ext/autosummary/ \
+		.$(site_packages)/sphinx/ext/autosummary/templates
 	set -e; \
-	for lang in `find $(SITE_PACKAGES_DIR)/sphinx/locale\
-		-maxdepth 1 -mindepth 1 -type d -printf "%f "`;\
-	do\
-		mkdir $(PACKAGE_DIR)/usr/share/sphinx/locale/$$lang;\
-		mkdir -p $(PACKAGE_DIR)/usr/share/locale/$$lang/LC_MESSAGES;\
-		mv $(SITE_PACKAGES_DIR)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.js\
-		   $(PACKAGE_DIR)/usr/share/sphinx/locale/$$lang/;\
-		mv $(SITE_PACKAGES_DIR)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.mo\
-		   $(PACKAGE_DIR)/usr/share/locale/$$lang/LC_MESSAGES;\
-		rm -rf $(SITE_PACKAGES_DIR)/sphinx/locale/$$lang;\
-	done
-	rm -f $(SITE_PACKAGES_DIR)/sphinx/locale/sphinx.pot
+	cd $(debroot) && \
+		for lang in $$(find .$(site_packages)/sphinx/locale \
+			-maxdepth 1 -mindepth 1 -type d -printf "%f "); \
+		do \
+			mkdir -p usr/share/sphinx/locale/$$lang/; \
+			mkdir -p usr/share/locale/$$lang/LC_MESSAGES/; \
+			mv -t usr/share/sphinx/locale/$$lang/ \
+				.$(site_packages)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.js; \
+			mv -t usr/share/locale/$$lang/LC_MESSAGES/ \
+				.$(site_packages)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.mo; \
+			rm -rf .$(site_packages)/sphinx/locale/$$lang; \
+		done
+	rm -f $(debroot)$(site_packages)/sphinx/locale/sphinx.pot
 	# install scripts not touched by easy install
-	install -m 755 $(CURDIR)/sphinx-build.py $(PACKAGE_DIR)/usr/bin/sphinx-build
-	install -m 755 $(CURDIR)/sphinx-quickstart.py $(PACKAGE_DIR)/usr/bin/sphinx-quickstart
-	install -m 755 $(CURDIR)/sphinx-autogen.py $(PACKAGE_DIR)/usr/bin/sphinx-autogen
+	install -m 755 sphinx-build.py $(debroot)/usr/bin/sphinx-build
+	install -m 755 sphinx-quickstart.py $(debroot)/usr/bin/sphinx-quickstart
+	install -m 755 sphinx-autogen.py $(debroot)/usr/bin/sphinx-autogen
 	# Move JavaScript code to libjs-sphinxdoc:
 	set -e; \
 	for js in $$(find build/html/_static/ -name '*.js'); do \
 		cp -f $$js debian/libjs-sphinxdoc/$(javascript_path); \
 	done
 	set -e; \
-	for js in $$(find $(PACKAGE_DIR)/usr/share/sphinx/themes/ -name '*.js'); do \
+	for js in $$(find $(debroot)/usr/share/sphinx/themes/ -name '*.js'); do \
 		mv $$js debian/libjs-sphinxdoc/$(javascript_path); \
 		ln -sf "$(javascript_path)/$${js##*/}" $$js; \
 	done


