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

[jwilk at users.alioth.debian.org]

    Date: Saturday, October 15, 2011 @ 13:17:08
  Author: jwilk
Revision: 18929

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-15 13:16:01 UTC (rev 18928)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-15 13:17:08 UTC (rev 18929)
@@ -37,8 +37,10 @@
     interrupted.
   * Remove unneeded mkdir call.
   * Fix a typo in the package description.
+  * Use a for loop in debian/rules to install all sphinx-* scripts.
+  * Use ‘set -x’ for all for loops in debian/rules.
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 14:08:17 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 15:03:43 +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-15 13:16:01 UTC (rev 18928)
+++ packages/sphinx/branches/1.1/debian/rules	2011-10-15 13:17:08 UTC (rev 18929)
@@ -59,27 +59,25 @@
 	mkdir -p $(debroot)/usr/share/sphinx/ext/autosummary/
 	cd $(debroot) && mv -t usr/share/sphinx/ext/autosummary/ \
 		.$(site_packages)/sphinx/ext/autosummary/templates
-	set -e; \
+	set -e -x; \
 	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; \
+			install -m 644 -D .$(site_packages)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.js \
+				usr/share/sphinx/locale/$$lang/sphinx.js; \
+			install -m 644 -D .$(site_packages)/sphinx/locale/$$lang/LC_MESSAGES/sphinx.mo \
+				usr/share/locale/$$lang/LC_MESSAGES/sphinx.mo; \
 		done
-	rm -f $(debroot)$(site_packages)/sphinx/locale/sphinx.pot
+	cd $(debroot)$(site_packages)/sphinx/locale && rm -rf sphinx.pot */
 	# install scripts not touched by easy install
-	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
+	set -e -x; \
+	for script in sphinx-*.py; do \
+		install -m 755 $$script $(debroot)/usr/bin/$${script%.py}; \
+	done
 	install -m 755 sphinx-apidoc.py $(debroot)/usr/bin/sphinx-apidoc
 	# Move JavaScript code to libjs-sphinxdoc:
-	set -e; \
+	set -e -x; \
 	for js in $$(find build/html/_static/ -name '*.js'); do \
 		cp -f $$js debian/libjs-sphinxdoc/$(javascript_path); \
 	done