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

[jwilk at users.alioth.debian.org]

    Date: Saturday, October 15, 2011 @ 16:14:42
  Author: jwilk
Revision: 18938

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-15 16:07:33 UTC (rev 18937)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-15 16:14:42 UTC (rev 18938)
@@ -28,24 +28,19 @@
       symlink. Conflict with older versions of python-docutils, so that dpkg
       can replace one with the other. Add lintian override.
   * Run dh_install with --fail-missing.
-  * Refactor the code responsible for moving data into a private directory.
-    Rename some variables to make them lowercase. Don't use CURDIR where it's
-    not necessary.
-  * Build manual pages (except for sphinx-autogen) from upstream sources.
-    Merge changes that were made for Debian into them. Thanks to Stefano
-    Rivera for help.
-  * 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.
-  * Fix a typo in the package description.
-  * Use a for loop in debian/rules to install all sphinx-* scripts.
-  * Use ‘set -x’ for all for loops in debian/rules.
-  * Modify sphinx.package_dir directly in debian/rules, not via patch. This
-    makes move_static_files_outside_site-packages.patch fully forwardable
-    upstream, and makes running tests easier.
+  * Improve debian/rules:
+    + Make the build actually fail if integration tests for the JavaScript
+      code fail.
+    + Refactor the code responsible for moving data into a private directory.
+      Rename some variables to make them lowercase. Don't use CURDIR where
+      it's not necessary.
+    + Make it possible to rebuild the package without running clean target.
+    + Remove unneeded mkdir calls.
+    + Use a for loop in debian/rules to install all sphinx-* scripts.
+    + Use ‘set -x’ for all for loops.
+    + Run nosetests with --verbose --no-skip.
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 15:51:21 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 18:04:21 +0200
 
 sphinx (1.0.8+dfsg-2) unstable; urgency=low
 

Modified: packages/sphinx/branches/1.1/debian/rules
===================================================================
--- packages/sphinx/branches/1.1/debian/rules	2011-10-15 16:07:33 UTC (rev 18937)
+++ packages/sphinx/branches/1.1/debian/rules	2011-10-15 16:14:42 UTC (rev 18938)
@@ -51,8 +51,10 @@
 	# move static files outside {site,dist}-packages
 	sed -i -e "s!^package_dir = .*!package_dir = '/usr/share/sphinx'!" \
 		$(debroot)$(site_packages)/sphinx/__init__.py
+	rm -rf $(debroot)/usr/share/sphinx/
 	mkdir -p $(debroot)/usr/share/sphinx/
-	cd $(debroot) && mv -t usr/share/sphinx/ .$(site_packages)/sphinx/texinputs \
+	cd $(debroot) && mv -t usr/share/sphinx/ \
+		.$(site_packages)/sphinx/texinputs \
 		.$(site_packages)/sphinx/themes
 	mkdir -p $(debroot)/usr/share/sphinx/pycode/
 	cd $(debroot) && mv -t usr/share/sphinx/pycode/ \