[Python-modules-commits] r30582 - in packages/sphinx/trunk/debian (6 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Friday, September 12, 2014 @ 08:27:00
  Author: mitya57-guest
Revision: 30582

* Add Takayuki Shimizukawa?\226?\128?\153s signing key to upstream-signing-key.pgp.
* Replace links to online docutils docs with links to packaged
  docutils docs.

Added:
  packages/sphinx/trunk/debian/watch
    (from rev 26796, packages/sphinx/trunk/debian/watch)
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/control
  packages/sphinx/trunk/debian/rules
  packages/sphinx/trunk/debian/upstream-signing-key.pgp
Deleted:
  packages/sphinx/trunk/debian/watch

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2014-09-12 08:21:48 UTC (rev 30581)
+++ packages/sphinx/trunk/debian/changelog	2014-09-12 08:27:00 UTC (rev 30582)
@@ -3,10 +3,11 @@
   * New upstream bugfix release.
   * Drop websupport_todo.diff, applied upstream.
   * Update date and version in sphinx-autogen.1.
-  * Disable signature checking, does not work when upstream
-    uses different signing keys for different releases.
+  * Add Takayuki Shimizukawa’s signing key to upstream-signing-key.pgp.
+  * Replace links to online docutils docs with links to packaged
+    docutils docs.
 
- -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 10 Sep 2014 19:14:52 +0400
+ -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 12 Sep 2014 11:49:40 +0400
 
 sphinx (1.2.2+dfsg-4) unstable; urgency=medium
 

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2014-09-12 08:21:48 UTC (rev 30581)
+++ packages/sphinx/trunk/debian/control	2014-09-12 08:27:00 UTC (rev 30582)
@@ -103,7 +103,7 @@
 Architecture: all
 Conflicts: python-sphinx (<< 1.1)
 Replaces: python-sphinx (<< 1.1)
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: docutils-doc, ${misc:Depends}, ${sphinxdoc:Depends}
 Description: documentation generator for Python projects - documentation
  Sphinx is a tool for producing documentation for Python projects, using
  reStructuredText as markup language.

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2014-09-12 08:21:48 UTC (rev 30581)
+++ packages/sphinx/trunk/debian/rules	2014-09-12 08:27:00 UTC (rev 30582)
@@ -45,6 +45,8 @@
 
 build-stamp: sphinx-build.py build/javascript-stamp
 	python ./sphinx-build.py -T doc build/html/
+	find build/html/ -name '*.txt' -or -name '*.html' | xargs -L1 sed -i \
+		's!http://docutils.sourceforge.net/docs/!file:///usr/share/doc/docutils-doc/docs/!g'
 	rm -rf build/man
 	cp -rl build/html build/man
 	python ./sphinx-build.py -T -b man doc build/man

Modified: packages/sphinx/trunk/debian/upstream-signing-key.pgp
===================================================================
(Binary files differ)

Deleted: packages/sphinx/trunk/debian/watch
===================================================================
--- packages/sphinx/trunk/debian/watch	2014-09-12 08:21:48 UTC (rev 30581)
+++ packages/sphinx/trunk/debian/watch	2014-09-12 08:27:00 UTC (rev 30582)
@@ -1,3 +0,0 @@
-version=3
-opts=uversionmangle=s/b/~b/,dversionmangle=s/\+dfsg// \
-https://pypi.python.org/packages/source/S/Sphinx/Sphinx-(.*)\.tar\.gz

Copied: packages/sphinx/trunk/debian/watch (from rev 26796, packages/sphinx/trunk/debian/watch)
===================================================================
--- packages/sphinx/trunk/debian/watch	                        (rev 0)
+++ packages/sphinx/trunk/debian/watch	2014-09-12 08:27:00 UTC (rev 30582)
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/b/~b/,dversionmangle=s/\+dfsg//,pgpsigurlmangle=s/$/.asc/ \
+https://pypi.python.org/packages/source/S/Sphinx/Sphinx-(.*)\.tar\.gz