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

[jwilk at users.alioth.debian.org]

    Date: Sunday, June 5, 2011 @ 15:28:32
  Author: jwilk
Revision: 17288

Documentation cannot be easily built with move_static_files_outside_site-packages applied, so pop it beforehand.

Modified:
  packages/sphinx/branches/0.6/debian/changelog
  packages/sphinx/branches/0.6/debian/patches/series
  packages/sphinx/branches/0.6/debian/rules

Modified: packages/sphinx/branches/0.6/debian/changelog
===================================================================
--- packages/sphinx/branches/0.6/debian/changelog	2011-06-05 15:20:57 UTC (rev 17287)
+++ packages/sphinx/branches/0.6/debian/changelog	2011-06-05 15:28:32 UTC (rev 17288)
@@ -1,4 +1,4 @@
-sphinx (0.6.6-4) UNRELEASED; urgency=low
+sphinx (0.6.6-3+squeeze1) stable; urgency=low
 
   [ Stefano Rivera ]
   * Improve language and clarify options in manpages.
@@ -6,9 +6,10 @@
   [ Jakub Wilk ]
   * Backport upstream patch to fix incompatibility with jQuery >= 1.4
     (closes: #628642). Thanks to Yaroslav Halchenko for the bug report.
-  * Apply patches before building documentation.
+  * Apply patches (except move_static_files_outside_site-packages) before
+    building documentation.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 Jun 2011 17:20:26 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 05 Jun 2011 17:21:23 +0200
 
 sphinx (0.6.6-3) unstable; urgency=low
 

Modified: packages/sphinx/branches/0.6/debian/patches/series
===================================================================
--- packages/sphinx/branches/0.6/debian/patches/series	2011-06-05 15:20:57 UTC (rev 17287)
+++ packages/sphinx/branches/0.6/debian/patches/series	2011-06-05 15:28:32 UTC (rev 17288)
@@ -1,2 +1,2 @@
+fix_jquery_1.4_incompatibility.patch
 move_static_files_outside_site-packages.patch
-fix_jquery_1.4_incompatibility.patch

Modified: packages/sphinx/branches/0.6/debian/rules
===================================================================
--- packages/sphinx/branches/0.6/debian/rules	2011-06-05 15:20:57 UTC (rev 17287)
+++ packages/sphinx/branches/0.6/debian/rules	2011-06-05 15:28:32 UTC (rev 17288)
@@ -12,6 +12,8 @@
 
 build-stamp: patch
 	dh_testdir
+	# documentation cannot be easily built with move_static_files_outside_site-packages applied, so pop it:
+	quilt pop 
 	mkdir -p _build/html
 	python sphinx-build.py doc _build/html
 	touch build-stamp