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

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

    Date: Monday, January 20, 2014 @ 15:33:34
  Author: mitya57-guest
Revision: 27329

No longer move Grammar.txt and Grammar.pickle to shared location,
upstream is now shipping different versions of grammar for Python 2
and Python 3.

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

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2014-01-20 14:36:54 UTC (rev 27328)
+++ packages/sphinx/trunk/debian/changelog	2014-01-20 15:33:34 UTC (rev 27329)
@@ -4,6 +4,9 @@
   * Drop fix_jinja_recursion.diff, applied upstream.
   * Drop unversioned_grammar_pickle.diff, a different fix was applied
     upstream.
+  * No longer move Grammar.txt and Grammar.pickle to shared location,
+    upstream is now shipping different versions of grammar for Python 2
+    and Python 3.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 20 Jan 2014 18:28:47 +0400
 

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2014-01-20 14:36:54 UTC (rev 27328)
+++ packages/sphinx/trunk/debian/rules	2014-01-20 15:33:34 UTC (rev 27329)
@@ -60,8 +60,7 @@
 	$(python_all) tests/run.py --verbose --no-skip
 	export LC_ALL=C.UTF-8 && \
 	$(python3_all) tests/run.py --verbose
-	cd build/py2/ && rm -rf tests/ sphinx/pycode/Grammar.pickle
-	cd build/py3/ && rm -rf tests/ sphinx/pycode/Grammar.pickle
+	rm -rf build/py2/tests/ build/py3/tests/
 	xvfb-run -a ./debian/jstest/run-tests build/html/
 endif
 	touch build-stamp
@@ -86,15 +85,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.txt
-	cp -t $(debroot)/usr/share/sphinx/pycode/ sphinx/pycode/Grammar.pickle
 	mkdir -p $(debroot)/usr/share/sphinx/ext/autosummary/
 	cd $(debroot) && mv -t usr/share/sphinx/ext/autosummary/ \
 		.$(site_packages)/sphinx/ext/autosummary/templates
 	cd $(debroot)$(py3_site_packages)/sphinx/ && \
-		rm -rf texinputs/ themes/ pycode/Grammar.txt ext/autosummary/templates/
+		rm -rf texinputs/ themes/ ext/autosummary/templates/
 	set -e -x; \
 	cd $(debroot) && \
 		for lang in $(locales); \