[Python-modules-commits] r23881 - in packages/sphinx/trunk/debian (5 files)

[jwilk at users.alioth.debian.org]

    Date: Monday, April 8, 2013 @ 18:39:20
  Author: jwilk
Revision: 23881

Use a dedicated script to extract JavaScript code for libjs-sphinxdoc.

Added:
  packages/sphinx/trunk/debian/dh-sphinxdoc/conf.py
  packages/sphinx/trunk/debian/dh-sphinxdoc/empty.rst
  packages/sphinx/trunk/debian/dh-sphinxdoc/install-js
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2013-04-08 18:19:19 UTC (rev 23880)
+++ packages/sphinx/trunk/debian/changelog	2013-04-08 18:39:20 UTC (rev 23881)
@@ -14,8 +14,9 @@
   * Make it impossible to accidentally build the source package with an
     .orig.tar that includes jquery.js or underscore.js.
   * Refactor debian/rules.
+  * Use a dedicated script to extract JavaScript code for libjs-sphinxdoc.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 08 Apr 2013 14:02:09 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 08 Apr 2013 20:34:41 +0200
 
 sphinx (1.1.3+dfsg-7) experimental; urgency=low
 

Added: packages/sphinx/trunk/debian/dh-sphinxdoc/conf.py
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/conf.py	                        (rev 0)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/conf.py	2013-04-08 18:39:20 UTC (rev 23881)
@@ -0,0 +1,2 @@
+master_doc = 'empty'
+html_theme_options = {'collapsiblesidebar': True}


Property changes on: packages/sphinx/trunk/debian/dh-sphinxdoc/conf.py
___________________________________________________________________
Added: svn:mime-type
   + text/x-python

Added: packages/sphinx/trunk/debian/dh-sphinxdoc/empty.rst
===================================================================
Added: packages/sphinx/trunk/debian/dh-sphinxdoc/install-js
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/install-js	                        (rev 0)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/install-js	2013-04-08 18:39:20 UTC (rev 23881)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e -u
+
+if [ $# -eq 0 ]
+then
+    printf 'Usage: %s <target-directory>\n' "$0" >&2
+    exit 1
+fi
+
+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 \
+| 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"
+rm -rf "$here/tmp/"
+
+# vim:ts=4 sw=4 et


Property changes on: packages/sphinx/trunk/debian/dh-sphinxdoc/install-js
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2013-04-08 18:19:19 UTC (rev 23880)
+++ packages/sphinx/trunk/debian/rules	2013-04-08 18:39:20 UTC (rev 23881)
@@ -118,12 +118,7 @@
 		sed -e 's/@SCRIPTS@/$(scripts)/' $$maintscript > $${maintscript%.in}; \
 	done
 	# Move JavaScript code to libjs-sphinxdoc:
-	rm -f build/html/_static/websupport.js
-	set -e -x; \
-	for js in $$(find build/html/_static/ -name '*.js'); do \
-		rm -f debian/libjs-sphinxdoc/$(javascript_path)/$${js##*/}; \
-		cp -f $$js debian/libjs-sphinxdoc/$(javascript_path); \
-	done
+	debian/dh-sphinxdoc/install-js debian/libjs-sphinxdoc/$(javascript_path)/
 	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); \