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

[jwilk at users.alioth.debian.org]

    Date: Thursday, January 26, 2012 @ 21:53:50
  Author: jwilk
Revision: 20135

Merge 1.0 -> 1.1.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/dh-sphinxdoc/dh_sphinxdoc
  packages/sphinx/branches/1.1/debian/get-orig-source.sh

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2012-01-26 21:51:50 UTC (rev 20134)
+++ packages/sphinx/branches/1.1/debian/changelog	2012-01-26 21:53:50 UTC (rev 20135)
@@ -5,6 +5,10 @@
     using dh_python2 and those using python-support, to be co-importable.
   * Add various texlive-* and libjs-mathjax to Suggests.
   * Don't install SOURCES.txt into binary packages.
+  * dh_sphinxdoc: produce different diagnostic message when unknown JavaScript
+    script is being ignored than when it's a fatal error.
+  * Make the get-orig-source script create temporary files in /tmp (or
+    $TMPDIR).
 
  -- Jakub Wilk <jwilk at debian.org>  Sat, 26 Nov 2011 15:24:48 +0100
 

Modified: packages/sphinx/branches/1.1/debian/dh-sphinxdoc/dh_sphinxdoc
===================================================================
--- packages/sphinx/branches/1.1/debian/dh-sphinxdoc/dh_sphinxdoc	2012-01-26 21:51:50 UTC (rev 20134)
+++ packages/sphinx/branches/1.1/debian/dh-sphinxdoc/dh_sphinxdoc	2012-01-26 21:53:50 UTC (rev 20135)
@@ -215,11 +215,11 @@
     my $basic = grep { $_ eq $js } qw(searchtools.js doctools.js jquery.js underscore.js);
     if ($basic)
     {
-        error($message);
+        error("error: $message");
     }
     else
     {
-        warning($message);
+        warning("ignoring $message");
     }
 }
 

Modified: packages/sphinx/branches/1.1/debian/get-orig-source.sh
===================================================================
--- packages/sphinx/branches/1.1/debian/get-orig-source.sh	2012-01-26 21:51:50 UTC (rev 20134)
+++ packages/sphinx/branches/1.1/debian/get-orig-source.sh	2012-01-26 21:53:50 UTC (rev 20135)
@@ -11,7 +11,7 @@
 fi
 upstream_version="${dfsg_version%+dfsg*}"
 cd "$(dirname "$0")/../"
-tmpdir=$(mktemp -d get-orig-source.XXXXXX)
+tmpdir=$(mktemp -t -d get-orig-source.XXXXXX)
 uscan --noconf --force-download --rename --download-version="$upstream_version" --destdir="$tmpdir"
 cd "$tmpdir"
 tar -xzf sphinx_*.orig.tar.gz