[Python-modules-commits] r22915 - in packages/sphinx/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Wednesday, November 7, 2012 @ 23:32:14
  Author: jwilk
Revision: 22915

Sort stopwords in searchtools.js.

Added:
  packages/sphinx/trunk/debian/patches/sort_stopwords.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-11-07 21:27:22 UTC (rev 22914)
+++ packages/sphinx/trunk/debian/changelog	2012-11-07 23:32:14 UTC (rev 22915)
@@ -13,13 +13,16 @@
   * Update version number in the sphinx-autogen manpage.
   * dh_sphinxdoc: fix the --tmpdir option. Thanks to Andriy Senkovych for the
     bug report.
+  * Sort stopwords in searchtools.js. Thanks to Dmitry Shachnev for the bug
+    report.
 
   [ Dmitry Shachnev ]
   * Update Homepage field to point to http://sphinx-doc.org/.
   * Build-depend of python3-all instead of python3.
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 07 Nov 2012 21:30:46 +0100
 
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 08 Nov 2012 00:31:15 +0100
+
 sphinx (1.1.3+dfsg-4) unstable; urgency=low
 
   * Add DEP-8 tests.

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2012-11-07 21:27:22 UTC (rev 22914)
+++ packages/sphinx/trunk/debian/patches/series	2012-11-07 23:32:14 UTC (rev 22915)
@@ -9,3 +9,4 @@
 pygments_byte_strings.diff
 fix_shorthandoff.diff
 test_build_html_rb.diff
+sort_stopwords.diff

Added: packages/sphinx/trunk/debian/patches/sort_stopwords.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/sort_stopwords.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/sort_stopwords.diff	2012-11-07 23:32:14 UTC (rev 22915)
@@ -0,0 +1,16 @@
+Description: sort stopwords in searchtools.js
+ The order of stopwords in searchtools.js would be random is hash randomization
+ was enabled, breaking dh_sphinxdoc. This patch makes the order deterministic.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-11-07
+
+--- a/sphinx/search/__init__.py
++++ b/sphinx/search/__init__.py
+@@ -283,5 +283,5 @@
+     def context_for_searchtool(self):
+         return dict(
+             search_language_stemming_code = self.lang.js_stemmer_code,
+-            search_language_stop_words = jsdump.dumps(self.lang.stopwords),
++            search_language_stop_words = jsdump.dumps(sorted(self.lang.stopwords)),
+         )