[Python-modules-commits] r17741 - in packages/sphinx/trunk/debian (dh_sphinxdoc rules)

[jwilk at users.alioth.debian.org]

    Date: Thursday, July 7, 2011 @ 16:39:45
  Author: jwilk
Revision: 17741

dh_sphinxdoc: nuke .doctrees subdirectory.

Modified:
  packages/sphinx/trunk/debian/dh_sphinxdoc
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/dh_sphinxdoc
===================================================================
--- packages/sphinx/trunk/debian/dh_sphinxdoc	2011-07-07 16:20:52 UTC (rev 17740)
+++ packages/sphinx/trunk/debian/dh_sphinxdoc	2011-07-07 16:39:45 UTC (rev 17741)
@@ -78,6 +78,13 @@
     }
     return @deps;
 }
+
+sub drop_doctrees($)
+{
+    my ($path) = @_;
+    my $doctrees = "$path/.doctrees/";
+    doit('rm', '-rf', $doctrees) if -d $doctrees;
+}
  
 sub fix_sphinx_doc($$)
 {
@@ -85,6 +92,7 @@
     return 0 if not looks_like_sphinx_doc($path);
     my @js = sanity_check($path);
     my @deps = fix_symlinks($path, @js);
+    drop_doctrees($path);
     map { addsubstvar($package, "sphinxdoc:Depends", $_) } @deps;
     return 1;
 }

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2011-07-07 16:20:52 UTC (rev 17740)
+++ packages/sphinx/trunk/debian/rules	2011-07-07 16:39:45 UTC (rev 17741)
@@ -90,12 +90,11 @@
 	dh_installchangelogs CHANGES
 	dh_installdocs
 	dh_install debian/dh_sphinxdoc /usr/bin/
-	rm -rf $(PACKAGE_DIR)/usr/share/doc/python-sphinx/html/.doctrees
 	./debian/dh_sphinxdoc /usr/share/doc/python-sphinx/html/
 	dh_installexamples
 	dh_installman
 	dh_pysupport
-	dh_compress -X.py -X.js -X.rst -X.json -X.doctree -X.txt -Xobjects.inv
+	dh_compress -X.py -X.js -X.rst -X.json -X.txt -Xobjects.inv
 	dh_link
 	dh_fixperms
 	dh_installdeb