[Python-apps-commits] r11005 - in packages/s3ql/trunk/debian (6 files)
nikratio-guest at users.alioth.debian.org
nikratio-guest at users.alioth.debian.org
Sat Jun 28 21:22:55 UTC 2014
Date: Saturday, June 28, 2014 @ 21:22:54
Author: nikratio-guest
Revision: 11005
* New upstream release.
* Dropped patches/sphinx-1.1.1-compat.diff (no longer required now
that Sphinx 1.2 is in unstable).
* Added patches/workaround_sphinx_bug_1196.diff.
Added:
packages/s3ql/trunk/debian/patches/workaround_sphinx_bug_1196.diff
Modified:
packages/s3ql/trunk/debian/README.source
packages/s3ql/trunk/debian/changelog
packages/s3ql/trunk/debian/control
packages/s3ql/trunk/debian/patches/series
Deleted:
packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff
Modified: packages/s3ql/trunk/debian/README.source
===================================================================
--- packages/s3ql/trunk/debian/README.source 2014-06-26 07:39:52 UTC (rev 11004)
+++ packages/s3ql/trunk/debian/README.source 2014-06-28 21:22:54 UTC (rev 11005)
@@ -13,4 +13,8 @@
debian/copyright. To retrieve and repack the latest upstream
tarball, run
- # uscan --repack
+ # PERL_LWP_SSL_VERIFY_HOSTNAME=0 uscan --repack
+
+ (Deactivating hostname verification isn't a problem because the
+ upstream tarball is GPG signed, but necessary to work around
+ bug #749225.)
Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog 2014-06-26 07:39:52 UTC (rev 11004)
+++ packages/s3ql/trunk/debian/changelog 2014-06-28 21:22:54 UTC (rev 11005)
@@ -1,3 +1,12 @@
+s3ql (2.9+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Dropped patches/sphinx-1.1.1-compat.diff (no longer required now
+ that Sphinx 1.2 is in unstable).
+ * Added patches/workaround_sphinx_bug_1196.diff.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sat, 28 Jun 2014 12:30:45 -0700
+
s3ql (2.8.1+dfsg-1) unstable; urgency=low
* Updated upstream project URL.
Modified: packages/s3ql/trunk/debian/control
===================================================================
--- packages/s3ql/trunk/debian/control 2014-06-26 07:39:52 UTC (rev 11004)
+++ packages/s3ql/trunk/debian/control 2014-06-28 21:22:54 UTC (rev 11005)
@@ -11,11 +11,13 @@
python3-dbg,
python3-setuptools (>= 0.6.14),
python3-apsw (>= 3.7.0),
- python3-sphinx (>= 1.1.3),
+ python3-sphinx (>= 1.2),
python3-llfuse (>= 0.39),
python3-crypto,
- python3-dugong,
+ python3-requests,
+ python3-dugong (>= 3.1),
python3-pytest (>= 2.3.3),
+ python3-defusedxml,
cython3 (>= 0.17),
texlive-latex-base,
texlive-latex-recommended,
Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series 2014-06-26 07:39:52 UTC (rev 11004)
+++ packages/s3ql/trunk/debian/patches/series 2014-06-28 21:22:54 UTC (rev 11005)
@@ -1,3 +1,3 @@
proc_mount.diff
clock-granularity.diff
-sphinx-1.1.1-compat.diff
+workaround_sphinx_bug_1196.diff
Deleted: packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff 2014-06-26 07:39:52 UTC (rev 11004)
+++ packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff 2014-06-28 21:22:54 UTC (rev 11005)
@@ -1,75 +0,0 @@
-Description: Monkeypatch for Sphinx 1.1.3 compatibility
-Origin: debian
-Forwarded: no
-Last-Update: <2013-10-19>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
-This patch can be dropped as soon as Sphinx 1.2 (or newer)
-arrives in unstable. It works around issues
-
-https://bitbucket.org/birkenfeld/sphinx/issue/1281/
-
-and
-
-https://bitbucket.org/birkenfeld/sphinx/issue/1196/
-
---- a/setup.py
-+++ b/setup.py
-@@ -19,6 +19,13 @@
- raise SystemExit('Setuptools package not found. Please install from '
- 'https://pypi.python.org/pypi/setuptools')
- from setuptools import Extension
-+
-+# Work around https://bitbucket.org/birkenfeld/sphinx/issue/1196/
-+import locale
-+import os
-+os.environ['LC_ALL'] = 'C.UTF-8'
-+os.environ['LANG'] = 'C.UTF-8'
-+locale.setlocale(locale.LC_ALL, '')
-
- from distutils.version import LooseVersion
- import os
-@@ -67,6 +74,7 @@
- except ImportError:
- raise SystemExit('This command requires Sphinx to be installed.') from None
-
-+ fix_sphinx_issue_1281()
- fix_docutils()
-
- dest_dir = os.path.join(basedir, 'doc')
-@@ -301,6 +309,35 @@
-
- assert docutils.parsers.get_parser_class('rst') is rst.Parser
-
-+def fix_sphinx_issue_1281():
-+ '''Monkeypatch for https://bitbucket.org/birkenfeld/sphinx/issue/1281'''
-+
-+ import sphinx
-+
-+ sphinx_ver = tuple(sphinx.__version__.split('.'))
-+ if sphinx_ver >= ('1', '2'):
-+ return
-+
-+ elif sphinx_ver != ('1', '1', '3'):
-+ raise SystemExit('Need Sphinx 1.2 or newer')
-+
-+ from sphinx.writers import manpage
-+ from sphinx.locale import admonitionlabels
-+
-+ try:
-+ del manpage.ManualPageTranslator.visit_admonition
-+ except AttributeError:
-+ pass
-+
-+ real_init = manpage.ManualPageTranslator.__init__
-+
-+ def __init__(self, builder, *args, **kwds):
-+ real_init(self, builder, *args, **kwds)
-+ # Overwrite admonition label translations with our own
-+ for label, translation in admonitionlabels.items():
-+ self.language.labels[label] = self.deunicode(translation)
-+
-+
-
- if __name__ == '__main__':
- main()
Added: packages/s3ql/trunk/debian/patches/workaround_sphinx_bug_1196.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/workaround_sphinx_bug_1196.diff (rev 0)
+++ packages/s3ql/trunk/debian/patches/workaround_sphinx_bug_1196.diff 2014-06-28 21:22:54 UTC (rev 11005)
@@ -0,0 +1,26 @@
+Description: Work around Sphinx issue #1196
+Origin: debian
+Forwarded: no
+Last-Update: <2014-06-28>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+This patch works around
+https://bitbucket.org/birkenfeld/sphinx/issue/1196/
+
+--- a/setup.py
++++ b/setup.py
+@@ -20,6 +20,13 @@
+ 'https://pypi.python.org/pypi/setuptools')
+ from setuptools import Extension
+
++# Work around https://bitbucket.org/birkenfeld/sphinx/issue/1196/
++import locale
++import os
++os.environ['LC_ALL'] = 'C.UTF-8'
++os.environ['LANG'] = 'C.UTF-8'
++locale.setlocale(locale.LC_ALL, '')
++
+ from distutils.version import LooseVersion
+ import os
+ import subprocess
+
More information about the Python-apps-commits
mailing list