[Python-modules-commits] [pygments] 04/05: Merge new upstream release (2.1.3)
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon May 2 10:07:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository pygments.
commit f445dc9b2bf5d7e2e9ba677bcae5556505731ab8
Merge: 9259a86 a881420
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon May 2 12:54:17 2016 +0300
Merge new upstream release (2.1.3)
.hgignore | 19 +++++++++
.hgtags | 31 +++++++++++++++
CHANGES | 28 ++++++++++++++
PKG-INFO | 2 +-
Pygments.egg-info/PKG-INFO | 2 +-
Pygments.egg-info/SOURCES.txt | 34 ++++++++++++++++
debian/.git-dpm | 6 +--
debian/changelog | 8 +++-
debian/patches/change_docs_theme.patch | 4 +-
doc/docs/integrate.rst | 11 ++++++
doc/faq.rst | 32 +++++++--------
pygments/__init__.py | 2 +-
pygments/formatters/_mapping.py | 2 +-
pygments/formatters/html.py | 4 +-
pygments/formatters/img.py | 10 +++--
pygments/formatters/latex.py | 9 ++++-
pygments/lexers/_mapping.py | 6 +--
pygments/lexers/c_cpp.py | 9 ++++-
pygments/lexers/chapel.py | 13 ++++---
pygments/lexers/dotnet.py | 6 +--
pygments/lexers/hdl.py | 25 +++++++-----
pygments/lexers/julia.py | 25 ++++++++----
pygments/lexers/lisp.py | 2 +-
pygments/lexers/python.py | 39 +++++++++++--------
pygments/lexers/rdf.py | 71 ++++++++++++++++++++--------------
pygments/lexers/shell.py | 11 +++---
pygments/lexers/sql.py | 20 +++++++---
pygments/lexers/templates.py | 6 ++-
pygments/lexers/textfmts.py | 5 +++
pygments/token.py | 8 ++++
requirements.txt | 5 +++
setup.cfg | 3 ++
setup.py | 2 +-
tests/test_html_formatter.py | 4 +-
tests/test_token.py | 8 ++++
tox.ini | 7 ++++
36 files changed, 354 insertions(+), 125 deletions(-)
diff --cc debian/.git-dpm
index bde5202,0000000..3b1bd90
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- ee06730e4e7551f20bb14e4d395b122f099a15c9
- ee06730e4e7551f20bb14e4d395b122f099a15c9
- 2795ecc67b331bde9b00cbad508e1ace0e4eed18
++a8814206e0d8cd8842dd0c634b19e85ed0455300
++a8814206e0d8cd8842dd0c634b19e85ed0455300
++e69a782be13ffbdc263a758c17f1929526a111a9
+e69a782be13ffbdc263a758c17f1929526a111a9
+pygments_2.1.3+dfsg.orig.tar.gz
+8b1e44c3bf6df7e46c64f01bad88a108c833615f
+1066081
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 6a8bb0b,0000000..92063fa
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,307 -1,0 +1,311 @@@
- pygments (2.1+dfsg-2) UNRELEASED; urgency=medium
++pygments (2.1.3+dfsg-1) UNRELEASED; urgency=medium
+
++ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
- -- Ondřej Nový <novy at ondrej.org> Tue, 29 Mar 2016 21:49:56 +0200
++ [ Dmitry Shachnev ]
++ * New upstream bugfix release.
++
++ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 02 May 2016 12:54:25 +0300
+
+pygments (2.1+dfsg-1) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Drop CVE-2015-8557.patch, applied upstream.
+ * Disable two tests that need example files, again.
+ * Stop setting PYTHONWARNINGS=d when running the autopkgtests, that
+ breaks the cmdline test which checks that process stderr is empty.
+
+ [ Piotr Ożarowski ]
+ * Remove /etc/bash_completion.d/pygmentize conffile in maintainer scripts
+ (closes: #810661)
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 25 Jan 2016 18:04:14 +0300
+
+pygments (2.0.1+dfsg-2) unstable; urgency=high
+
+ [ Salvatore Bonaccorso ]
+ * Add CVE-2015-8557.patch patch.
+ CVE-2015-8557: Shell injection in FontManager._get_nix_font_path.
+ (Closes: #802828)
+
+ [ Piotr Ożarowski ]
+ * debian/watch: use pypi.debian.net redirector
+ * install pygmentize's bash completion to
+ /usr/share/bash-completion/completions
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 10 Jan 2016 18:56:35 +0100
+
+pygments (2.0.1+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/copyright: add the missing licenses of:
+ - pygments/lexers/robotframework.py
+ - tests/dtds/HTMLspec.ent
+ - tests/dtds/HTMLlat1.ent
+ - tests/dtds/HTMLsym.ent
+ (Closes: #766042)
+
+ -- Sébastien Villemot <sebastien at debian.org> Sun, 22 Mar 2015 10:23:41 +0100
+
+pygments (2.0.1+dfsg-1) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Drop disable_example_files_test.patch, no longer needed.
+ * Enable verbose tests output.
+
+ [ Piotr Ożarowski ]
+ * New upstream release
+ - pygmentize no longer fails when writing UTF-8 to output files
+ (closes: 771724)
+ * Drop doc/_build from the tarball (mostly due to missing JS sources; these
+ files are regenerated anyway)
+ * Remove .pyc files from upstream tarball
+ * make_utf8_default patch removed, no longer needed
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 09 Nov 2014 23:03:38 +0100
+
+pygments (2.0~rc1.a2bc2bd+dfsg-1) unstable; urgency=medium
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Dmitry Shachnev ]
+ * Make autopkgtests depend on patch (to fix test failure on CI)
+ and python[3]-all (to run tests for all supported Python versions).
+ Closes: #740166.
+
+ [ Piotr Ożarowski ]
+ * New upstream release
+ - Bump X-Python-Version to 2.6
+ * Documentation moved to new binary package: python-pygments-doc
+ * Add dh-python and python-sphinx to Build-Depends
+ * Switch debhelper compat level to 9
+ * Standards-Version bumped to 3.9.6 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 19 Oct 2014 23:00:26 +0200
+
+pygments (1.6+dfsg-1) experimental; urgency=low
+
+ * New upstream release
+ * fix_makefile_re.patch removed, no longer needed
+ * debian/watch file updated to handle rc versions correctly
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 03 Feb 2013 22:32:34 +0100
+
+pygments (1.5+dfsg-2) unstable; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Add DEP-8 tests (closes: #693028).
+ * Remove unneeded build-dependency on quilt.
+ * Bump Standards-Version to 3.9.4.
+ + Add empty build-arch target to debian/rules.
+ * Drop Breaks: {python:Breaks}, it is obsolete.
+ * debian/patches/fix_makefile_re.patch: cherry-picked upstream commit
+ that fixes Makefile highlighting.
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 06 Jan 2013 14:38:26 +0100
+
+pygments (1.5+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * make_utf8_default patch: do not change the encoding guessing part in
+ pygments/lexer.py; updated to new upstream version
+ * debian/pygmentize no longer needed, upstream now ships the script in the
+ tarball (and it returns correct exit codes, closes: 628881)
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 11 Mar 2012 18:22:42 +0100
+
+pygments (1.4+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Provide python3-pygments binary package
+ * Convert from python-support to dh_python2
+ * Source package format changed to 3.0 (quilt)
+ * Standards-Version bumped to 3.9.1 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Tue, 04 Jan 2011 20:13:50 +0100
+
+pygments (1.3.1+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Add ttf-bitstream-vera package to Suggests ("img" formatter needs it)
+ * Homepage field updated
+
+ -- Piotr Ożarowski <piotr at debian.org> Sat, 20 Mar 2010 20:43:06 +0100
+
+pygments (1.3+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ - install Bash completion script for pygmentize
+ * Standards-Version bumped to 3.8.4 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Tue, 02 Mar 2010 20:06:16 +0100
+
+pygments (1.2.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 03 Jan 2010 00:50:59 +0100
+
+pygments (1.2.1+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ - minimum required Python version bumped to 2.4
+
+ -- Piotr Ożarowski <piotr at debian.org> Sat, 02 Jan 2010 21:40:38 +0100
+
+pygments (1.1.1+dfsg-2) unstable; urgency=low
+
+ * Add --prefix=/usr (Python >= 2.6 needs it)
+
+ -- Piotr Ożarowski <piotr at debian.org> Fri, 13 Nov 2009 23:04:50 +0100
+
+pygments (1.1.1+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ - upstream tarball repackaged: tests/examplefiles removed (at least one
+ of example files is not DFSG-free and I'm too lazy to review the rest
+ as most of them have different copyright holder and license),
+ get-orig-source target added, debian/watch file updated
+ * use_jinja2_to_generate_docs patch removed (incorporated upstream)
+ * disable_ez_setup.patch no longer needed
+ * make_utf8_default.patch updated
+ * debian/copyright file updated
+ * Standards-Version bumped to 3.8.3 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 13 Sep 2009 10:13:17 +0200
+
+pygments (1.0-3) unstable; urgency=low
+
+ * Add use_jinja2_to_generate_docs patch and replace python-jinja with
+ python-jinja2 build dependency
+ * Standards-Version bumped to 3.8.2 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Thu, 09 Jul 2009 22:30:15 +0200
+
+pygments (1.0-2) unstable; urgency=low
+
+ * Add description to the patches
+ * Remove brainf*ck from long description (LP: #302898)
+ * Upload to unstable
+
+ -- Piotr Ożarowski <piotr at debian.org> Tue, 10 Feb 2009 19:14:36 +0100
+
+pygments (1.0-1) experimental; urgency=low
+
+ [ Sandro Tosi ]
+ * Switch Vcs-Browser field to viewsvn
+
+ [ Piotr Ożarowski ]
+ * New upstream release (upload to experimental due to Lenny freeze, to ease
+ testing rev. dependencies)
+ * Install scripts from external directory as examples (closes: #497532)
+ * debian/copyright: list of copyright holders updated
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 23 Nov 2008 20:14:31 +0100
+
+pygments (0.11.1-1) experimental; urgency=low
+
+ * New upstream release (upload to experimental due to Lenny freeze, to ease
+ testing rev. dependencies)
+ * Standards-Version bumped to 3.8.0:
+ + debian/README.source file added
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 31 Aug 2008 16:48:09 +0200
+
+pygments (0.10-1) unstable; urgency=low
+
+ * New upstream release
+ * Add make_utf8_default patch - useful while using pygmentize with pipes
+ (use: pygmentize -P 'encoding=ascii' if you want old behaviour)
+ * Install debian/pygmentize instead of script created by setuptools
+ * Change Debian packaging licence to match upstream
+
+ -- Piotr Ożarowski <piotr at debian.org> Wed, 07 May 2008 20:38:26 +0200
+
+pygments (0.9-3) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - uniforming Vcs-Browser field
+
+ [ Piotr Ożarowski ]
+ * Switch to python-support
+ * Replace python-setuptools runtime dependency with new python-pkg-resources
+ (closes: 468710)
+ * Compress binary package with bzip2
+ * Strip the "-1" from quilt's and setuptools' required build versions
+
+ -- Piotr Ożarowski <piotr at debian.org> Sat, 01 Mar 2008 13:37:39 +0100
+
+pygments (0.9-2) unstable; urgency=low
+
+ * Install original pygmentize script (not touched by setuptools)
+ (closes: 455222)
+ * Bump Standards-Version to 3.7.3 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Mon, 10 Dec 2007 19:59:55 +0100
+
+pygments (0.9-1) unstable; urgency=low
+
+ * New upstream release
+ * Add patch that disables ez_setup at build time
+ - quilt added to Build-Depends
+ * Homepage field added
+ * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now)
+
+ -- Piotr Ożarowski <piotr at debian.org> Mon, 15 Oct 2007 22:37:08 +0200
+
+pygments (0.8.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Piotr Ożarowski <piotr at debian.org> Thu, 28 Jun 2007 15:08:22 +0200
+
+pygments (0.8-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump required Jinja version (build dependency)
+ * Added python-setuptools to Recommends
+
+ -- Piotr Ożarowski <piotr at debian.org> Wed, 30 May 2007 19:33:29 +0200
+
+pygments (0.7.1-2) unstable; urgency=low
+
+ * Upload to unstable
+ * debian/copyright file updated
+ * Changed my address to piotr at debian.org
+
+ -- Piotr Ożarowski <piotr at debian.org> Mon, 09 Apr 2007 20:18:54 +0200
+
+pygments (0.7.1-1) experimental; urgency=low
+
+ * New upstream release (upload to experimental due to Etch freeze)
+
+ -- Piotr Ozarowski <ozarow at gmail.com> Thu, 15 Feb 2007 21:17:10 +0100
+
+pygments (0.7-1) experimental; urgency=low
+
+ * New upstream release (upload to experimental due to Etch freeze)
+ * Some debian/rules cleanups
+
+ -- Piotr Ozarowski <ozarow at gmail.com> Wed, 14 Feb 2007 21:52:50 +0100
+
+pygments (0.6-1) experimental; urgency=low
+
+ * New upstream release (upload to experimental due to Etch freeze)
+ * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control
+ * Added python-chardet to Recommends: (guessing input encoding added)
+ * debian/copyright updated (license change to BSD)
+ * Removed debian/pygmentize.1 manpage (it's in upstream sources now)
+
+ -- Piotr Ozarowski <ozarow at gmail.com> Thu, 21 Dec 2006 16:20:10 +0100
+
+pygments (0.5.1-1) unstable; urgency=low
+
+ * Initial release (closes: #395064)
+
+ -- Piotr Ozarowski <ozarow at gmail.com> Mon, 30 Oct 2006 17:19:10 +0100
+
diff --cc debian/patches/change_docs_theme.patch
index a62fd53,0000000..d744f25
mode 100644,000000..100644
--- a/debian/patches/change_docs_theme.patch
+++ b/debian/patches/change_docs_theme.patch
@@@ -1,23 -1,0 +1,23 @@@
- From ee06730e4e7551f20bb14e4d395b122f099a15c9 Mon Sep 17 00:00:00 2001
++From a8814206e0d8cd8842dd0c634b19e85ed0455300 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:34:58 -0700
- Subject: change_docs_theme
++Subject: Change Sphinx documentation theme to 'default'
+
+Patch-Name: change_docs_theme.patch
+---
+ doc/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index 51a9161..82ae598 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -85,7 +85,7 @@ exclude_patterns = ['_build']
+
+ # The theme to use for HTML and HTML Help pages. See the documentation for
+ # a list of builtin themes.
+-html_theme = 'pygments14'
++html_theme = 'default'
+
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pygments.git
More information about the Python-modules-commits
mailing list