[Python-modules-commits] r20740 - in packages/pygments/tags (8 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Sun Mar 11 17:29:05 UTC 2012
Date: Sunday, March 11, 2012 @ 17:29:04
Author: piotr
Revision: 20740
[svn-buildpackage] Tagging pygments 1.5+dfsg-1
Added:
packages/pygments/tags/1.5+dfsg-1/
packages/pygments/tags/1.5+dfsg-1/debian/changelog
(from rev 20739, packages/pygments/trunk/debian/changelog)
packages/pygments/tags/1.5+dfsg-1/debian/patches/make_utf8_default.patch
(from rev 20739, packages/pygments/trunk/debian/patches/make_utf8_default.patch)
packages/pygments/tags/1.5+dfsg-1/debian/rules
(from rev 20739, packages/pygments/trunk/debian/rules)
Deleted:
packages/pygments/tags/1.5+dfsg-1/debian/changelog
packages/pygments/tags/1.5+dfsg-1/debian/patches/make_utf8_default.patch
packages/pygments/tags/1.5+dfsg-1/debian/pygmentize
packages/pygments/tags/1.5+dfsg-1/debian/rules
Deleted: packages/pygments/tags/1.5+dfsg-1/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog 2012-03-11 11:36:20 UTC (rev 20736)
+++ packages/pygments/tags/1.5+dfsg-1/debian/changelog 2012-03-11 17:29:04 UTC (rev 20740)
@@ -1,199 +0,0 @@
-pygments (1.4+dfsg-2) UNRELEASED; urgency=low
-
- * make_utf8_default patch: do not change the encoding guessing part in
- pygments/lexer.py
-
- -- Piotr Ożarowski <piotr at debian.org> Wed, 23 Feb 2011 21:30:53 +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
-
Copied: packages/pygments/tags/1.5+dfsg-1/debian/changelog (from rev 20739, packages/pygments/trunk/debian/changelog)
===================================================================
--- packages/pygments/tags/1.5+dfsg-1/debian/changelog (rev 0)
+++ packages/pygments/tags/1.5+dfsg-1/debian/changelog 2012-03-11 17:29:04 UTC (rev 20740)
@@ -0,0 +1,202 @@
+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
+
Deleted: packages/pygments/tags/1.5+dfsg-1/debian/patches/make_utf8_default.patch
===================================================================
--- packages/pygments/trunk/debian/patches/make_utf8_default.patch 2012-03-11 11:36:20 UTC (rev 20736)
+++ packages/pygments/tags/1.5+dfsg-1/debian/patches/make_utf8_default.patch 2012-03-11 17:29:04 UTC (rev 20740)
@@ -1,95 +0,0 @@
-use UTF-8 by default
-`echo "Ożarowski" | pygmentize -l diff` works fine now :-)
-
-upstream knows about this patch (will not apply it as not all distributions are
-using UTF-8 by defauly, like Debian does)
-
-Index: Pygments-1.4/pygments/cmdline.py
-===================================================================
---- Pygments-1.4.orig/pygments/cmdline.py
-+++ Pygments-1.4/pygments/cmdline.py
-@@ -394,20 +394,20 @@ def main(args=sys.argv):
- else:
- code = sys.stdin.read()
-
-- # No encoding given? Use latin1 if output file given,
-+ # No encoding given? Use utf-8 if output file given,
- # stdin/stdout encoding otherwise.
- # (This is a compromise, I'm not too happy with it...)
- if 'encoding' not in parsed_opts and 'outencoding' not in parsed_opts:
- if outfn:
- # encoding pass-through
-- fmter.encoding = 'latin1'
-+ fmter.encoding = 'utf-8'
- else:
- if sys.version_info < (3,):
- # use terminal encoding; Python 3's terminals already do that
- lexer.encoding = getattr(sys.stdin, 'encoding',
-- None) or 'ascii'
-+ None) or 'utf-8'
- fmter.encoding = getattr(sys.stdout, 'encoding',
-- None) or 'ascii'
-+ None) or 'utf-8'
-
- # ... and do it!
- try:
-Index: Pygments-1.4/pygments/formatters/latex.py
-===================================================================
---- Pygments-1.4.orig/pygments/formatters/latex.py
-+++ Pygments-1.4/pygments/formatters/latex.py
-@@ -358,6 +358,6 @@ class LatexFormatter(Formatter):
- dict(docclass = self.docclass,
- preamble = self.preamble,
- title = self.title,
-- encoding = self.encoding or 'latin1',
-+ encoding = self.encoding or 'utf-8',
- styledefs = self.get_style_defs(),
- code = outfile.getvalue()))
-Index: Pygments-1.4/pygments/lexer.py
-===================================================================
---- Pygments-1.4.orig/pygments/lexer.py
-+++ Pygments-1.4/pygments/lexer.py
-@@ -55,7 +55,7 @@ class Lexer(object):
- ``encoding``
- If given, must be an encoding name. This encoding will be used to
- convert the input string to Unicode, if it is not already a Unicode
-- string (default: ``'latin1'``).
-+ string (default: ``'utf-8'``).
- Can also be ``'guess'`` to use a simple UTF-8 / Latin1 detection, or
- ``'chardet'`` to use the chardet library, if it is installed.
- """
-@@ -83,7 +83,7 @@ class Lexer(object):
- self.stripall = get_bool_opt(options, 'stripall', False)
- self.ensurenl = get_bool_opt(options, 'ensurenl', True)
- self.tabsize = get_int_opt(options, 'tabsize', 0)
-- self.encoding = options.get('encoding', 'latin1')
-+ self.encoding = options.get('encoding', 'utf-8')
- # self.encoding = options.get('inencoding', None) or self.encoding
- self.filters = []
- for filter_ in get_list_opt(options, 'filters', ()):
-Index: Pygments-1.4/pygments/lexers/__init__.py
-===================================================================
---- Pygments-1.4.orig/pygments/lexers/__init__.py
-+++ Pygments-1.4/pygments/lexers/__init__.py
-@@ -101,7 +101,7 @@ def get_lexer_for_filename(_fn, code=Non
-
- if sys.version_info > (3,) and isinstance(code, bytes):
- # decode it, since all analyse_text functions expect unicode
-- code = code.decode('latin1')
-+ code = code.decode('utf-8')
-
- def get_rating(cls):
- # The class _always_ defines analyse_text because it's included in
-Index: Pygments-1.4/pygments/formatters/other.py
-===================================================================
---- Pygments-1.4.orig/pygments/formatters/other.py
-+++ Pygments-1.4/pygments/formatters/other.py
-@@ -64,7 +64,7 @@ class RawTokenFormatter(Formatter):
- if self.encoding:
- raise OptionError('the raw formatter does not support the '
- 'encoding option')
-- self.encoding = 'ascii' # let pygments.format() do the right thing
-+ self.encoding = 'utf-8' # let pygments.format() do the right thing
- self.compress = get_choice_opt(options, 'compress',
- ['', 'none', 'gz', 'bz2'], '')
- self.error_color = options.get('error_color', None)
Copied: packages/pygments/tags/1.5+dfsg-1/debian/patches/make_utf8_default.patch (from rev 20739, packages/pygments/trunk/debian/patches/make_utf8_default.patch)
===================================================================
--- packages/pygments/tags/1.5+dfsg-1/debian/patches/make_utf8_default.patch (rev 0)
+++ packages/pygments/tags/1.5+dfsg-1/debian/patches/make_utf8_default.patch 2012-03-11 17:29:04 UTC (rev 20740)
@@ -0,0 +1,95 @@
+use UTF-8 by default
+`echo "Ożarowski" | pygmentize -l diff` works fine now :-)
+
+upstream knows about this patch (will not apply it as not all distributions are
+using UTF-8 by defauly, like Debian does)
+
+Index: pygments-1.5/pygments/formatters/latex.py
+===================================================================
+--- pygments-1.5.orig/pygments/formatters/latex.py
++++ pygments-1.5/pygments/formatters/latex.py
+@@ -367,6 +367,6 @@ class LatexFormatter(Formatter):
+ dict(docclass = self.docclass,
+ preamble = self.preamble,
+ title = self.title,
+- encoding = self.encoding or 'latin1',
++ encoding = self.encoding or 'utf-8',
+ styledefs = self.get_style_defs(),
+ code = outfile.getvalue()))
+Index: pygments-1.5/pygments/lexer.py
+===================================================================
+--- pygments-1.5.orig/pygments/lexer.py
++++ pygments-1.5/pygments/lexer.py
+@@ -61,7 +61,7 @@ class Lexer(object):
+ ``encoding``
+ If given, must be an encoding name. This encoding will be used to
+ convert the input string to Unicode, if it is not already a Unicode
+- string (default: ``'latin1'``).
++ string (default: ``'utf-8'``).
+ Can also be ``'guess'`` to use a simple UTF-8 / Latin1 detection, or
+ ``'chardet'`` to use the chardet library, if it is installed.
+ """
+@@ -89,7 +89,7 @@ class Lexer(object):
+ self.stripall = get_bool_opt(options, 'stripall', False)
+ self.ensurenl = get_bool_opt(options, 'ensurenl', True)
+ self.tabsize = get_int_opt(options, 'tabsize', 0)
+- self.encoding = options.get('encoding', 'latin1')
++ self.encoding = options.get('encoding', 'utf-8')
+ # self.encoding = options.get('inencoding', None) or self.encoding
+ self.filters = []
+ for filter_ in get_list_opt(options, 'filters', ()):
+Index: pygments-1.5/pygments/lexers/__init__.py
+===================================================================
+--- pygments-1.5.orig/pygments/lexers/__init__.py
++++ pygments-1.5/pygments/lexers/__init__.py
+@@ -101,7 +101,7 @@ def get_lexer_for_filename(_fn, code=Non
+
+ if sys.version_info > (3,) and isinstance(code, bytes):
+ # decode it, since all analyse_text functions expect unicode
+- code = code.decode('latin1')
++ code = code.decode('utf-8')
+
+ def get_rating(info):
+ cls, filename = info
+Index: pygments-1.5/pygments/formatters/other.py
+===================================================================
+--- pygments-1.5.orig/pygments/formatters/other.py
++++ pygments-1.5/pygments/formatters/other.py
+@@ -64,7 +64,7 @@ class RawTokenFormatter(Formatter):
+ if self.encoding:
+ raise OptionError('the raw formatter does not support the '
+ 'encoding option')
+- self.encoding = 'ascii' # let pygments.format() do the right thing
++ self.encoding = 'utf-8' # let pygments.format() do the right thing
+ self.compress = get_choice_opt(options, 'compress',
+ ['', 'none', 'gz', 'bz2'], '')
+ self.error_color = options.get('error_color', None)
+Index: pygments-1.5/pygments/cmdline.py
+===================================================================
+--- pygments-1.5.orig/pygments/cmdline.py
++++ pygments-1.5/pygments/cmdline.py
+@@ -394,20 +394,20 @@ def main(args=sys.argv):
+ else:
+ code = sys.stdin.read()
+
+- # No encoding given? Use latin1 if output file given,
++ # No encoding given? Use utf-8 if output file given,
+ # stdin/stdout encoding otherwise.
+ # (This is a compromise, I'm not too happy with it...)
+ if 'encoding' not in parsed_opts and 'outencoding' not in parsed_opts:
+ if outfn:
+ # encoding pass-through
+- fmter.encoding = 'latin1'
++ fmter.encoding = 'utf-8'
+ else:
+ if sys.version_info < (3,):
+ # use terminal encoding; Python 3's terminals already do that
+ lexer.encoding = getattr(sys.stdin, 'encoding',
+- None) or 'ascii'
++ None) or 'utf-8'
+ fmter.encoding = getattr(sys.stdout, 'encoding',
+- None) or 'ascii'
++ None) or 'utf-8'
+ elif not outfn and sys.version_info > (3,):
+ # output to terminal with encoding -> use .buffer
+ outfile = sys.stdout.buffer
Deleted: packages/pygments/tags/1.5+dfsg-1/debian/pygmentize
===================================================================
--- packages/pygments/trunk/debian/pygmentize 2012-03-11 11:36:20 UTC (rev 20736)
+++ packages/pygments/tags/1.5+dfsg-1/debian/pygmentize 2012-03-11 17:29:04 UTC (rev 20740)
@@ -1,3 +0,0 @@
-#! /usr/bin/python
-import pygments.cmdline
-pygments.cmdline.main()
Deleted: packages/pygments/tags/1.5+dfsg-1/debian/rules
===================================================================
--- packages/pygments/trunk/debian/rules 2012-03-11 11:36:20 UTC (rev 20736)
+++ packages/pygments/tags/1.5+dfsg-1/debian/rules 2012-03-11 17:29:04 UTC (rev 20740)
@@ -1,65 +0,0 @@
-#!/usr/bin/make -f
-
-#export DH_VERBOSE=1
-
-PYVERS ?= $(shell pyversions -vr) $(shell py3versions -vr)
-pkgdir = $(CURDIR)/debian/python$(if $(patsubst 3.%,,$(1)),,3)-pygments
-
-clean:
- dh_testdir
- dh_testroot
- rm -rf build Pygments.egg-info
- find . -name "*\.py[co]" -delete
- dh_clean build-indep install-stamp $(PYVERS:%=install-python%-stamp)
-
-build: build-indep
-
-build-indep:
- dh_testdir
- dh_installdirs
- PYTHONPATH='.' python docs/generate.py html debian/python-pygments/usr/share/doc/python-pygments/
- touch $@
-
-install: build install-stamp $(PYVERS:%=install-python%-stamp)
-
-install-stamp:
- dh_installdirs
- install -m 644 external/pygments.bashcomp debian/python-pygments/etc/bash_completion.d/pygmentize
- touch $@
-
-install-python%-stamp:
- python$* setup.py install --single-version-externally-managed \
- --root $(call pkgdir,$*) --install-layout=deb
- touch $@
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -i CHANGES
- dh_installexamples -i
- dh_installdocs -i
- dh_installman -i
- dh_install -i -p python-pygments debian/pygmentize /usr/bin/
- rm -rf debian/python3-pygments/usr/bin/
- dh_python2 -i
- dh_python3 -i
- dh_compress -i -X.py -X.inv
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i -- -Z bzip2
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-get-orig-source:
- VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p');\
- uscan --force-download --rename --download-version=$$VER --destdir=.;\
- tar -zx --exclude=tests/examplefiles --exclude=test/test_examplefiles.py -f pygments_$$VER.orig.tar.gz;\
- tar -zcf ./pygments_$$VER+dfsg.orig.tar.gz Pygments-$$VER;\
- rm -f ./pygments_$$VER.orig.tar.gz;\
- rm -rf Pygments-$$VER
-
-.PHONY: build clean binary-indep binary-arch binary install
Copied: packages/pygments/tags/1.5+dfsg-1/debian/rules (from rev 20739, packages/pygments/trunk/debian/rules)
===================================================================
--- packages/pygments/tags/1.5+dfsg-1/debian/rules (rev 0)
+++ packages/pygments/tags/1.5+dfsg-1/debian/rules 2012-03-11 17:29:04 UTC (rev 20740)
@@ -0,0 +1,65 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+PYVERS ?= $(shell pyversions -vr) $(shell py3versions -vr)
+pkgdir = $(CURDIR)/debian/python$(if $(patsubst 3.%,,$(1)),,3)-pygments
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -rf build Pygments.egg-info
+ find . -name "*\.py[co]" -delete
+ dh_clean build-indep install-stamp $(PYVERS:%=install-python%-stamp)
+
+build: build-indep
+
+build-indep:
+ dh_testdir
+ dh_installdirs
+ PYTHONPATH='.' python docs/generate.py html debian/python-pygments/usr/share/doc/python-pygments/
+ touch $@
+
+install: build install-stamp $(PYVERS:%=install-python%-stamp)
+
+install-stamp:
+ dh_installdirs
+ install -m 644 external/pygments.bashcomp debian/python-pygments/etc/bash_completion.d/pygmentize
+ touch $@
+
+install-python%-stamp:
+ python$* setup.py install --single-version-externally-managed \
+ --root $(call pkgdir,$*) --install-layout=deb
+ touch $@
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i CHANGES
+ dh_installexamples -i
+ dh_installdocs -i
+ dh_installman -i
+ dh_install -i -p python-pygments pygmentize /usr/bin/
+ rm -rf debian/python3-pygments/usr/bin/
+ dh_python2 -i
+ dh_python3 -i
+ dh_compress -i -X.py -X.inv
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i -- -Z bzip2
+
+binary-arch:
+
+binary: binary-indep binary-arch
+
+get-orig-source:
+ VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p');\
+ uscan --force-download --rename --download-version=$$VER --destdir=.;\
+ tar -zx --exclude=tests/examplefiles --exclude=test/test_examplefiles.py -f pygments_$$VER.orig.tar.gz;\
+ tar -zcf ./pygments_$$VER+dfsg.orig.tar.gz Pygments-$$VER;\
+ rm -f ./pygments_$$VER.orig.tar.gz;\
+ rm -rf Pygments-$$VER
+
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Python-modules-commits
mailing list