[Python-modules-commits] r27357 - in packages/sphinx/trunk/debian (changelog rules)

[mitya57-guest at users.alioth.debian.org]

    Date: Tuesday, January 21, 2014 @ 16:35:25
  Author: mitya57-guest
Revision: 27357

Move Grammar files to /usr/share/sphinx, the code still expects
that thay are in that location (closes: #736239).

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2014-01-21 16:19:46 UTC (rev 27356)
+++ packages/sphinx/trunk/debian/changelog	2014-01-21 16:35:25 UTC (rev 27357)
@@ -1,3 +1,10 @@
+sphinx (1.2.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Move Grammar files to /usr/share/sphinx, the code still expects
+    that thay are in that location (closes: #736239).
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 21 Jan 2014 19:47:34 +0400
+
 sphinx (1.2.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2014-01-21 16:19:46 UTC (rev 27356)
+++ packages/sphinx/trunk/debian/rules	2014-01-21 16:35:25 UTC (rev 27357)
@@ -33,6 +33,7 @@
 	find . -name '*.py[co]' -delete
 	rm -rf build
 	rm -f $(basename $(wildcard debian/*.in))
+	rm -f sphinx/pycode/Grammar*.pickle
 
 .PHONY: build build-arch build-indep
 build build-indep: build-stamp
@@ -63,6 +64,9 @@
 	rm -rf build/py2/tests/ build/py3/tests/
 	xvfb-run -a ./debian/jstest/run-tests build/html/
 endif
+	# import sphinx.pycode to generate grammar pickle files
+	cd build/py2/ && python -c "import sphinx.pycode"
+	cd build/py3/ && python3 -c "import sphinx.pycode"
 	touch build-stamp
 
 .PHONY: binary binary-arch binary-indep
@@ -85,6 +89,11 @@
 	cd $(debroot) && mv -t usr/share/sphinx/ \
 		.$(site_packages)/sphinx/texinputs \
 		.$(site_packages)/sphinx/themes
+	mkdir -p $(debroot)/usr/share/sphinx/pycode/
+	cd $(debroot) && mv -t usr/share/sphinx/pycode/ \
+		.$(site_packages)/sphinx/pycode/Grammar*
+	cd $(debroot) && mv -t usr/share/sphinx/pycode/ \
+		.$(py3_site_packages)/sphinx/pycode/Grammar*
 	mkdir -p $(debroot)/usr/share/sphinx/ext/autosummary/
 	cd $(debroot) && mv -t usr/share/sphinx/ext/autosummary/ \
 		.$(site_packages)/sphinx/ext/autosummary/templates