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

[jwilk at users.alioth.debian.org]

    Date: Saturday, October 15, 2011 @ 21:11:56
  Author: jwilk
Revision: 18948

Merge 1.0 -> 1.1.

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

Modified: packages/sphinx/branches/1.1/debian/rules
===================================================================
--- packages/sphinx/branches/1.1/debian/rules	2011-10-15 21:02:21 UTC (rev 18947)
+++ packages/sphinx/branches/1.1/debian/rules	2011-10-15 21:11:56 UTC (rev 18948)
@@ -10,6 +10,9 @@
 upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
 upstream_version = $(firstword $(subst +, ,$(debian_version)))
 
+locales = $(notdir $(patsubst %/LC_MESSAGES,%,$(wildcard sphinx/locale/*/LC_MESSAGES)))
+scripts = $(basename $(wildcard sphinx-*.py))
+
 debroot = debian/tmp/
 site_packages = $(call py_libdir,$(shell pyversions -d))
 py3_site_packages = $(call py_libdir,$(shell py3versions -d))
@@ -77,8 +80,7 @@
 		rm -rf texinputs/ themes/ pycode/Grammar.txt ext/autosummary/templates/
 	set -e -x; \
 	cd $(debroot) && \
-		for lang in $$(find .$(site_packages)/sphinx/locale \
-			-maxdepth 1 -mindepth 1 -type d -printf "%f "); \
+		for lang in $(locales); \
 		do \
 			install -m 644 -D .$(site_packages)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.js \
 				usr/share/sphinx/locale/$$lang/sphinx.js; \
@@ -92,16 +94,16 @@
 	for python in python2 python3; do \
 		dir=$(debroot)/usr/share/sphinx/scripts/$$python/; \
 		mkdir -p $$dir; \
-		for script in sphinx-*.py; do \
-			sed -e "1 s,#!.*,#!/usr/bin/$${python%2}," $$script \
-			> $$dir/$${script%.py}; \
-			rm -f $(debroot)/usr/bin/$${script%.py}; \
+		for script in $(scripts); do \
+			sed -e "1 s,#!.*,#!/usr/bin/$${python%2}," $$script.py \
+			> $$dir/$$script; \
+			rm -f $(debroot)/usr/bin/$$script; \
 		done; \
 		chmod 755 $$dir/*; \
 	done
 	set -e -x; \
 	for maintscript in $(wildcard debian/sphinx-common.*.in); do \
-		sed -e 's/@SCRIPTS@/$(basename $(wildcard sphinx-*.py))/' $$maintscript > $${maintscript%.in}; \
+		sed -e 's/@SCRIPTS@/$(scripts)/' $$maintscript > $${maintscript%.in}; \
 	done
 	# Move JavaScript code to libjs-sphinxdoc:
 	set -e -x; \