[Python-modules-commits] r18916 - in packages/sphinx/branches/1.1/debian (changelog rules)

[jwilk at users.alioth.debian.org]

    Date: Friday, October 14, 2011 @ 22:27:31
  Author: jwilk
Revision: 18916

Merge 1.0 -> 1.1.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/rules

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2011-10-14 21:56:34 UTC (rev 18915)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-14 22:27:31 UTC (rev 18916)
@@ -23,6 +23,9 @@
   * Build manual pages (except for sphinx-autogen) from upstream sources.
     Merge changes that were made for Debian into them.
   * Run nosetests with --verbose --no-skip.
+  * Run ln with -f, so that the build target can be re-run if it's
+    interrupted.
+  * Remove unneeded mkdir call.
 
  -- Jakub Wilk <jwilk at debian.org>  Fri, 14 Oct 2011 23:52:00 +0200
 

Modified: packages/sphinx/branches/1.1/debian/rules
===================================================================
--- packages/sphinx/branches/1.1/debian/rules	2011-10-14 21:56:34 UTC (rev 18915)
+++ packages/sphinx/branches/1.1/debian/rules	2011-10-14 22:27:31 UTC (rev 18916)
@@ -20,9 +20,8 @@
 
 build-stamp:
 	dh_testdir
-	ln -s /usr/share/javascript/jquery/jquery.js sphinx/themes/basic/static/
-	ln -s /usr/share/javascript/underscore/underscore.js sphinx/themes/basic/static/
-	mkdir -p build/html
+	ln -sf /usr/share/javascript/jquery/jquery.js sphinx/themes/basic/static/
+	ln -sf /usr/share/javascript/underscore/underscore.js sphinx/themes/basic/static/
 	PYTHONPATH=. python debian/sphinx-build-local.py doc build/html/
 	rm -rf build/man
 	cp -rl build/html build/man