[Python-modules-commits] r20236 - in packages/sphinx/branches/1.1/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Wednesday, February 1, 2012 @ 13:04:59
  Author: jwilk
Revision: 20236

Don't include websupport.js in libjs-jquery.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/dh-sphinxdoc/index
  packages/sphinx/branches/1.1/debian/rules

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2012-02-01 12:02:23 UTC (rev 20235)
+++ packages/sphinx/branches/1.1/debian/changelog	2012-02-01 13:04:59 UTC (rev 20236)
@@ -12,8 +12,9 @@
   * Revert all the changes to manual pages that accumulated over the years.
   * Document that symlinking translations.js and non-English searchtools.js is
     not supported (see bug #658238).
+  * Don't include websupport.js in libjs-jquery.
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 01 Feb 2012 13:00:35 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 01 Feb 2012 14:00:29 +0100
 
 sphinx (1.1.2+dfsg-1) experimental; urgency=low
 

Modified: packages/sphinx/branches/1.1/debian/dh-sphinxdoc/index
===================================================================
--- packages/sphinx/branches/1.1/debian/dh-sphinxdoc/index	2012-02-01 12:02:23 UTC (rev 20235)
+++ packages/sphinx/branches/1.1/debian/dh-sphinxdoc/index	2012-02-01 13:04:59 UTC (rev 20236)
@@ -5,4 +5,3 @@
 1.0/sidebar.js
 1.0/theme_extras.js
 1.0/underscore.js
-1.0/websupport.js 1.1

Modified: packages/sphinx/branches/1.1/debian/rules
===================================================================
--- packages/sphinx/branches/1.1/debian/rules	2012-02-01 12:02:23 UTC (rev 20235)
+++ packages/sphinx/branches/1.1/debian/rules	2012-02-01 13:04:59 UTC (rev 20236)
@@ -107,13 +107,14 @@
 		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
 	set -e; \
-	for js in $$(find $(debroot)/usr/share/sphinx/themes/ -name '*.js'); do \
+	for js in $$(find $(debroot)/usr/share/sphinx/themes/ -name '*.js' -a '!' -name 'websupport.js'); do \
 		mv $$js debian/libjs-sphinxdoc/$(javascript_path); \
 		ln -sf "$(javascript_path)/$${js##*/}" $$js; \
 	done