[Python-modules-commits] r32551 - in packages/sphinx/trunk/debian (2 files)

[mitya57 at users.alioth.debian.org]

    Date: Saturday, May 2, 2015 @ 18:37:41
  Author: mitya57
Revision: 32551

Use explicit list of JS files to be installed or removed

Modified:
  packages/sphinx/trunk/debian/dh-sphinxdoc/install-js
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/dh-sphinxdoc/install-js
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/install-js	2015-05-02 17:32:47 UTC (rev 32550)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/install-js	2015-05-02 18:37:41 UTC (rev 32551)
@@ -11,11 +11,11 @@
 here="$(dirname "$0")"
 rm -rf "$here/tmp/"
 ./sphinx-build.py -b html "$here" "$here/tmp"
-find sphinx/themes/ -type f -name '*.js' ! -name websupport.js -and ! -name css3-mediaqueries_src.js \
-| xargs -t -I '{}' cp -f '{}' "$1"
-( cd "$here/tmp/_static" && rm jquery*.js underscore*.js websupport.js )
-find "$here/tmp/_static/" -name '*.js' \
-| xargs -t -I '{}' cp -f '{}' "$1"
+cp -f "sphinx/themes/basic/static/doctools.js" "$1"
+cp -f "sphinx/themes/bizstyle/static/css3-mediaqueries.js" "$1"
+cp -f "sphinx/themes/scrolls/static/theme_extras.js" "$1"
+cp -f "$here/tmp/_static/sidebar.js" "$1"
+cp -f "$here/tmp/_static/searchtools.js" "$1"
 rm -rf "$here/tmp/"
 
 # vim:ts=4 sw=4 et

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2015-05-02 17:32:47 UTC (rev 32550)
+++ packages/sphinx/trunk/debian/rules	2015-05-02 18:37:41 UTC (rev 32551)
@@ -125,6 +125,9 @@
 	done
 	# Move JavaScript code to libjs-sphinxdoc:
 	debian/dh-sphinxdoc/install-js debian/libjs-sphinxdoc/$(javascript_path)/
+	rm -f $(debroot)/usr/share/sphinx/themes/basic/static/underscore-*.js
+	rm -f $(debroot)/usr/share/sphinx/themes/basic/static/jquery-*.js
+	rm -f $(debroot)/usr/share/sphinx/themes/bizstyle/static/css3-mediaqueries_src.js
 	set -e; \
 	for js in $$(find $(debroot)/usr/share/sphinx/themes/ -name '*.js' -a '!' -name 'websupport.js'); do \
 		mv $$js debian/libjs-sphinxdoc/$(javascript_path); \