diff -Nru sphinx-1.1.3+dfsg/debian/changelog sphinx-1.1.3+dfsg/debian/changelog --- sphinx-1.1.3+dfsg/debian/changelog 2012-03-31 03:33:14.000000000 +0000 +++ sphinx-1.1.3+dfsg/debian/changelog 2012-04-11 19:58:39.000000000 +0000 @@ -1,20 +1,20 @@ -sphinx (1.1.3+dfsg-2ubuntu2) precise; urgency=low +sphinx (1.1.3+dfsg-3~precise1) precise; urgency=low - * Finish dh_python2 switch: - - Drop python-support from build-depends - - Update version requirement for python in build-depends + * Backport from debian - -- Scott Kitterman Fri, 30 Mar 2012 23:32:16 -0400 + -- Anton Gladky Wed, 11 Apr 2012 21:58:13 +0200 -sphinx (1.1.3+dfsg-2ubuntu1) precise; urgency=low +sphinx (1.1.3+dfsg-3) unstable; urgency=low - * Merge from Debian Testing. Remaining Ubuntu changes: - - Switch to dh_python2. - - debian/rules: export NO_PKG_MANGLE=1 in order to - not have translations stripped. - - debian/control: Drop the dependency on python-whoosh. + * Validate *.po files at build time. Add gettext to Build-Depends. + * Add fix_nepali_po.diff: remove Nepali translations that must have been + wrong. + * Add pygments_byte_strings.diff: fix Unicode issues in + PygmentsBridge.highlight_block (closes: #660930). Thanks to Anton Gladky + for the bug report and the initial patch. + * Fix a typo in a patch description. - -- Andrew Starr-Bochicchio Tue, 27 Mar 2012 16:25:04 -0400 + -- Jakub Wilk Mon, 02 Apr 2012 22:17:49 +0200 sphinx (1.1.3+dfsg-2) unstable; urgency=low @@ -58,28 +58,6 @@ -- Jakub Wilk Tue, 14 Feb 2012 00:13:35 +0100 -sphinx (1.1.2+dfsg-4ubuntu3) precise; urgency=low - - * debian/rules: export NO_PKG_MANGLE=1 in order to - not have translations stripped (LP: #480913). - - -- Andrew Starr-Bochicchio Tue, 13 Mar 2012 12:34:01 -0400 - -sphinx (1.1.2+dfsg-4ubuntu2) precise; urgency=low - - * Drop the dependency on python-whoosh. The latter is in universe - but the upstream Sphinx maintainer confirms it's only necessary for - experimental features. - - -- Barry Warsaw Tue, 21 Feb 2012 14:54:38 -0500 - -sphinx (1.1.2+dfsg-4ubuntu1) precise; urgency=low - - * Merge with Debian sid. (LP: #911124) Remaining Ubuntu delta: - - Switch to dh_python2. - - -- Barry Warsaw Wed, 08 Feb 2012 19:46:24 -0500 - sphinx (1.1.2+dfsg-4) unstable; urgency=low * Make the build actually fail if integration tests for the JavaScript diff -Nru sphinx-1.1.3+dfsg/debian/control sphinx-1.1.3+dfsg/debian/control --- sphinx-1.1.3+dfsg/debian/control 2012-03-31 03:32:13.000000000 +0000 +++ sphinx-1.1.3+dfsg/debian/control 2012-04-02 20:13:47.000000000 +0000 @@ -1,23 +1,25 @@ Source: sphinx Section: python Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Jakub Wilk +Maintainer: Jakub Wilk Uploaders: Debian Python Modules Team Homepage: http://sphinx.pocoo.org/ Build-Depends: debhelper (>= 7) -Build-Depends-Indep: python-all (>= 2.6.5-2~), python3 (>= 3.1.2-7~), +Build-Depends-Indep: python-support (>= 0.6.4), + python-all (>= 2.5.4-1~), python3 (>= 3.1.2-7~), python-setuptools (>= 0.6c5-1~), python3-setuptools, python-docutils (>= 0.7), python3-docutils (>= 0.7), python-pygments (>= 1.2), python3-pygments (>= 1.2), python-jinja2 (>= 2.3), python3-jinja2 (>= 2.3), python-sqlalchemy, python3-sqlalchemy, + python-whoosh, python-xapian, python-nose, python3-nose, python (>= 2.6.6-14~) | python-simplejson, xvfb, xauth, python-webkit, libjs-jquery (>= 1.4), libjs-underscore, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, - perl + perl, + gettext XS-Python-Version: >= 2.5 X-Python3-Version: >= 3.1 Standards-Version: 3.9.3 diff -Nru sphinx-1.1.3+dfsg/debian/patches/disable_distribute_setup.diff sphinx-1.1.3+dfsg/debian/patches/disable_distribute_setup.diff --- sphinx-1.1.3+dfsg/debian/patches/disable_distribute_setup.diff 2012-03-28 07:05:50.000000000 +0000 +++ sphinx-1.1.3+dfsg/debian/patches/disable_distribute_setup.diff 2012-04-02 20:17:34.000000000 +0000 @@ -1,4 +1,4 @@ -Description: Disable use of distribute_setup, which bootstrap distribute installation. +Description: disable use of distribute_setup, which bootstraps distribute installation Author: Jakub Wilk Forwarded: not-needed Last-Update: 2011-10-12 diff -Nru sphinx-1.1.3+dfsg/debian/patches/fix_nepali_po.diff sphinx-1.1.3+dfsg/debian/patches/fix_nepali_po.diff --- sphinx-1.1.3+dfsg/debian/patches/fix_nepali_po.diff 1970-01-01 00:00:00.000000000 +0000 +++ sphinx-1.1.3+dfsg/debian/patches/fix_nepali_po.diff 2012-03-25 09:57:20.000000000 +0000 @@ -0,0 +1,31 @@ +Description: remove Nepali translations that must have been wrong +Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/changeset/3e6a1cab6c2b +Bug: https://bitbucket.org/birkenfeld/sphinx/issue/900/format-string-errors-in-nepali-translation +Last-Update: 2012-03-25 + +--- a/sphinx/locale/ne/LC_MESSAGES/sphinx.po ++++ b/sphinx/locale/ne/LC_MESSAGES/sphinx.po +@@ -600,7 +600,7 @@ + #: sphinx/themes/basic/layout.html:122 + #, python-format + msgid "Search within %(docstitle)s" +-msgstr "भित्र-भित्रै खोज्नुहोस्" ++msgstr "" + + #: sphinx/themes/basic/layout.html:131 + msgid "About these documents" +@@ -630,12 +630,12 @@ + msgid "" + "Created using Sphinx " + "%(sphinx_version)s." +-msgstr "Sphinx प्रयोग गरेर बनाइएको" ++msgstr "" + + #: sphinx/themes/basic/opensearch.xml:4 + #, python-format + msgid "Search %(docstitle)s" +-msgstr "खोज्नुहोस्" ++msgstr "" + + #: sphinx/themes/basic/relations.html:11 + msgid "Previous topic" diff -Nru sphinx-1.1.3+dfsg/debian/patches/pygments_byte_strings.diff sphinx-1.1.3+dfsg/debian/patches/pygments_byte_strings.diff --- sphinx-1.1.3+dfsg/debian/patches/pygments_byte_strings.diff 1970-01-01 00:00:00.000000000 +0000 +++ sphinx-1.1.3+dfsg/debian/patches/pygments_byte_strings.diff 2012-04-02 20:16:45.000000000 +0000 @@ -0,0 +1,19 @@ +Description: fix Unicode issues in PygmentsBridge.highlight_block() + In some circumstances pygments.highlight() returns a byte string instead of + Unicode string. PygmentsBridge.highlight_block() does expect Unicode strings + only, so convert such strings forcibly to Unicode. +Bug-Debian: http://bugs.debian.org/660930 +Bug: https://bitbucket.org/birkenfeld/sphinx/issue/905/typeerror-expected-a-character-buffer +Author: Anton Gladky +Last-Update: 2012-04-02 + +--- a/sphinx/highlighting.py ++++ b/sphinx/highlighting.py +@@ -204,6 +204,7 @@ + try: + formatter = self.get_formatter(**kwargs) + hlsource = highlight(source, lexer, formatter) ++ hlsource = unicode(hlsource) + if self.dest == 'html': + return hlsource + else: diff -Nru sphinx-1.1.3+dfsg/debian/patches/series sphinx-1.1.3+dfsg/debian/patches/series --- sphinx-1.1.3+dfsg/debian/patches/series 2012-03-28 07:05:50.000000000 +0000 +++ sphinx-1.1.3+dfsg/debian/patches/series 2012-04-02 19:58:12.000000000 +0000 @@ -5,3 +5,5 @@ sphinxcontrib_namespace.diff python3_test_build_dir.diff skiptest_latex.diff +fix_nepali_po.diff +pygments_byte_strings.diff diff -Nru sphinx-1.1.3+dfsg/debian/rules sphinx-1.1.3+dfsg/debian/rules --- sphinx-1.1.3+dfsg/debian/rules 2012-03-28 07:05:50.000000000 +0000 +++ sphinx-1.1.3+dfsg/debian/rules 2012-03-16 23:05:31.000000000 +0000 @@ -3,7 +3,6 @@ include /usr/share/python/python.mk -export NO_PKG_MANGLE=1 export PYTHONWARNINGS=d here = $(dir $(firstword $(MAKEFILE_LIST)))/.. @@ -37,6 +36,7 @@ python setup.py build --build-lib build/py2/ python3 setup.py build --build-lib build/py3/ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + find sphinx/locale/ -name '*.po' | xargs -t -I {} msgfmt -o /dev/null -c {} $(python_all) tests/run.py --verbose --no-skip export LC_ALL=C.UTF-8 && $(python3_all) tests/run.py --verbose cd build/py3/ && rm -rf tests/ sphinx/pycode/Grammar.pickle @@ -135,7 +135,7 @@ $(warning W: version numbers in the manual pages are out of date) endif dh_installman - dh_python2 -p python-sphinx + dh_pysupport -p python-sphinx dh_python3 -p python3-sphinx --no-guessing-deps dh_compress -X.py -X.js -X.rst -X.json -X.txt -Xobjects.inv dh_link