[Python-modules-commits] r22914 - in packages/sphinx/trunk/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Wednesday, November 7, 2012 @ 21:27:22
  Author: jwilk
Revision: 22914

dh_sphinxdoc: fix the --tmpdir option.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-11-07 07:43:15 UTC (rev 22913)
+++ packages/sphinx/trunk/debian/changelog	2012-11-07 21:27:22 UTC (rev 22914)
@@ -11,14 +11,15 @@
     that this is fixed, stop running Python 3 tests under LC_ALL=C.
   * Make “debian/rules binary-arch” no-op.
   * Update version number in the sphinx-autogen manpage.
+  * dh_sphinxdoc: fix the --tmpdir option. Thanks to Andriy Senkovych 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>  Mon, 05 Nov 2012 22:16:02 +0100
-
 sphinx (1.1.3+dfsg-4) unstable; urgency=low
 
   * Add DEP-8 tests.

Modified: packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2012-11-07 07:43:15 UTC (rev 22913)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2012-11-07 21:27:22 UTC (rev 22914)
@@ -109,7 +109,9 @@
 sub load_packaged_js()
 {
     my %versions = ();
-    my $root = tmpdir('libjs-sphinxdoc');    
+    my $root = 'debian/libjs-sphinxdoc'; # It's tempting to use
+    # tmpdir('libjs-sphinxdoc') here, but it would break if the user passed
+    # --tmpdir to the command.
     $root = '' unless -d $root;
     my $path = "$root/usr/share/javascript/sphinxdoc";
     open(F, '<', "$path/index") or error("cannot open $path/index");