[Python-modules-commits] r9771 - in packages/pygments/trunk/debian (7 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Tue Sep 15 17:36:51 UTC 2009
Date: Tuesday, September 15, 2009 @ 17:36:50
Author: piotr
Revision: 9771
* New upstream release
* 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)
Modified:
packages/pygments/trunk/debian/changelog
packages/pygments/trunk/debian/control
packages/pygments/trunk/debian/copyright
packages/pygments/trunk/debian/patches/make_utf8_default.patch
packages/pygments/trunk/debian/patches/series
Deleted:
packages/pygments/trunk/debian/patches/disable_ez_setup.patch
packages/pygments/trunk/debian/patches/use_jinja2_to_generate_docs.patch
Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog 2009-09-15 17:17:32 UTC (rev 9770)
+++ packages/pygments/trunk/debian/changelog 2009-09-15 17:36:50 UTC (rev 9771)
@@ -1,3 +1,15 @@
+pygments (1.1.1-1) UNRELEASED; urgency=low
+
+TODO: fix debian/copyright
+ * New upstream release
+ * 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
Modified: packages/pygments/trunk/debian/control
===================================================================
--- packages/pygments/trunk/debian/control 2009-09-15 17:17:32 UTC (rev 9770)
+++ packages/pygments/trunk/debian/control 2009-09-15 17:36:50 UTC (rev 9771)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5), quilt (>=0.40)
Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4),
python-setuptools (>= 0.6b3), python-docutils, python-jinja2
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Homepage: http://pygments.pocoo.org/
XS-Python-Version: >= 2.3
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pygments/trunk/
Modified: packages/pygments/trunk/debian/copyright
===================================================================
--- packages/pygments/trunk/debian/copyright 2009-09-15 17:17:32 UTC (rev 9770)
+++ packages/pygments/trunk/debian/copyright 2009-09-15 17:36:50 UTC (rev 9771)
@@ -3,14 +3,13 @@
It was downloaded from http://pygments.pocoo.org/download/
-Upstream Author: Georg Brandl <g.brandl at gmx.net>
+Upstream Author: Georg Brandl <georg at python.org>
-Copyright: 2006-2008 by Georg Brandl, Armin Ronacher, Lukas Meuser and others
-(see AUTHORS file)
+Copyright: 2006-2009 by the Pygments team, see AUTHORS
License:
- Copyright (c) 2006 by the respective authors (see AUTHORS file).
+ Copyright (c) 2006-2009 by the respective authors (see AUTHORS file).
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -25,10 +24,6 @@
disclaimer in the documentation and/or other materials provided
with the distribution.
- * The names of the contributors may not be used to endorse or
- promote products derived from this software without specific
- prior written permission.
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -71,3 +66,40 @@
The Debian packaging is © 2006-2009, Piotr Ożarowski <piotr at debian.org> and
is licensed under the same licence as Pygments.
+
+../tests/examplefiles/format.ml:
+ Copyright 1996 Institut National de Recherche en Informatique et
+ en Automatique. All rights reserved. This file is distributed
+ under the terms of the GNU Library General Public License, with
+ the special exception on linking described in file ../LICENSE.
+../tests/examplefiles/test.html:
+ 2006-2007 by Georg Brandl.
+ license: GNU GPL, see LICENSE for more details.
+../tests/examplefiles/test.html: :copyright: 2006-2007 by Armin Ronacher.
+../tests/examplefiles/RegexMatcher.ns2:The Regular Expression Matcher (''The Software'') is Copyright (C) 1996, 1999 Vassili Bykov.
+../tests/examplefiles/RegexMatcher.ns2:You may distribute this software with the restrictions that no fee (with the exception of a reasonable fee to cover the cost of distribution media) may be charged for the distribution without a prior written consent of the author, and the software must be distributed with its documentation and copyright notices included and intact.
+../tests/examplefiles/RegexMatcher.ns2:is Copyright (C) 1996, 1999 Vassili Bykov.
+../tests/examplefiles/example.rb:# Copyright:: Copyright (c) 2003, 04 by Johannes Barre
+../tests/examplefiles/ltmain.sh:# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+../tests/examplefiles/ltmain.sh: $echo "Copyright (C) 2005 Free Software Foundation, Inc."
+../tests/examplefiles/zmlrpc.f90:!!$ (C) Copyright 2006 Salvatore Filippone University of Rome Tor Vergata
+../tests/examplefiles/test.cs:// MIT X11 license, Copyright (c) 2005-2006 by: //
+../tests/examplefiles/example.c: Copyright (C) 1993-2003 Yukihiro Matsumoto
+../tests/examplefiles/example.c: Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
+../tests/examplefiles/example.c: Copyright (C) 2000 Information-technology Promotion Agency, Japan
+../tests/examplefiles/Intro.java: * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+../tests/examplefiles/DancingSudoku.lhs: The usual BSD license applies, copyright 2006.
+../tests/examplefiles/example.xhtml:<!-- Copyright © 2006 Kashia Buch (kashia at vfemail.net), Fabian Buch (fabian at fabian-buch.de). All rights reserved. -->
+../tests/examplefiles/genclass.clj:; Copyright (c) Rich Hickey. All rights reserved.
+../tests/examplefiles/Sudoku.lhs:% Copyright 2005 Brian Alliet
+../tests/examplefiles/test.plot:# Copyright (c) 1991, Jos van der Woude, jvdwoude at hut.nl
+../tests/examplefiles/test.plot:print " Copyright (c) 1991, 1992, Jos van de Woude, jvdwoude at hut.nl"
+../tests/examplefiles/boot-9.scm:;;;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+../tests/examplefiles/example.cpp: copyright : (C) 2004 by André Simon
+../tests/examplefiles/example.cpp: * Copyright (c) 1998,1999,2000,2001,2002 Tal Davidson. All rights reserved.
+../tests/examplefiles/ANTLRv3.g: Copyright (c) 2005-2007 Terence Parr
+../tests/examplefiles/test.java: * Copyright (C) 2004, 2005, 2006 Aelitis, All Rights Reserved.
+../tests/examplefiles/test.pas:{ Copyright (c) 1997 Borland International }
+../tests/examplefiles/test.php: * @copyright Copyright (c) 2006, Manni
+../tests/examplefiles/Constants.mo:Copyright © 1998-2009, Modelica Association and DLR.
+../scripts/vim2pygments.py: :copyright 2006 by Armin Ronacher.
Deleted: packages/pygments/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/pygments/trunk/debian/patches/disable_ez_setup.patch 2009-09-15 17:17:32 UTC (rev 9770)
+++ packages/pygments/trunk/debian/patches/disable_ez_setup.patch 2009-09-15 17:36:50 UTC (rev 9771)
@@ -1,16 +0,0 @@
-python-setuptools is in Build-Depends-Indep, no need to download it at build time
-
-Index: pygments-1.0/setup.py
-===================================================================
---- pygments-1.0.orig/setup.py
-+++ pygments-1.0/setup.py
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
- # -*- coding: utf-8 -*-
--import ez_setup
--ez_setup.use_setuptools()
-+#import ez_setup
-+#ez_setup.use_setuptools()
- from setuptools import setup, find_packages
-
- import pygments
Modified: packages/pygments/trunk/debian/patches/make_utf8_default.patch
===================================================================
--- packages/pygments/trunk/debian/patches/make_utf8_default.patch 2009-09-15 17:17:32 UTC (rev 9770)
+++ packages/pygments/trunk/debian/patches/make_utf8_default.patch 2009-09-15 17:36:50 UTC (rev 9771)
@@ -4,11 +4,11 @@
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.0/pygments/cmdline.py
+Index: pygments-1.1/pygments/cmdline.py
===================================================================
---- pygments-1.0.orig/pygments/cmdline.py
-+++ pygments-1.0/pygments/cmdline.py
-@@ -394,17 +394,17 @@ def main(args=sys.argv):
+--- pygments-1.1.orig/pygments/cmdline.py
++++ pygments-1.1/pygments/cmdline.py
+@@ -394,20 +394,20 @@ def main(args=sys.argv):
else:
code = sys.stdin.read()
@@ -22,19 +22,22 @@
- fmter.encoding = 'latin1'
+ fmter.encoding = 'utf-8'
else:
- # use terminal encoding
-- lexer.encoding = getattr(sys.stdin, 'encoding', None) or 'ascii'
-- fmter.encoding = getattr(sys.stdout, 'encoding', None) or 'ascii'
-+ lexer.encoding = getattr(sys.stdin, 'encoding', None) or 'utf-8'
-+ fmter.encoding = getattr(sys.stdout, 'encoding', None) or 'utf-8'
+ 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.0/pygments/formatters/latex.py
+Index: pygments-1.1/pygments/formatters/latex.py
===================================================================
---- pygments-1.0.orig/pygments/formatters/latex.py
-+++ pygments-1.0/pygments/formatters/latex.py
-@@ -245,6 +245,6 @@ class LatexFormatter(Formatter):
+--- pygments-1.1.orig/pygments/formatters/latex.py
++++ pygments-1.1/pygments/formatters/latex.py
+@@ -299,6 +299,6 @@ class LatexFormatter(Formatter):
dict(docclass = self.docclass,
preamble = self.preamble,
title = self.title,
@@ -42,10 +45,10 @@
+ encoding = self.encoding or 'utf-8',
styledefs = self.get_style_defs(),
code = outfile.getvalue()))
-Index: pygments-1.0/pygments/lexer.py
+Index: pygments-1.1/pygments/lexer.py
===================================================================
---- pygments-1.0.orig/pygments/lexer.py
-+++ pygments-1.0/pygments/lexer.py
+--- pygments-1.1.orig/pygments/lexer.py
++++ pygments-1.1/pygments/lexer.py
@@ -56,7 +56,7 @@ class Lexer(object):
``encoding``
If given, must be an encoding name. This encoding will be used to
@@ -64,3 +67,38 @@
# self.encoding = options.get('inencoding', None) or self.encoding
self.filters = []
for filter_ in get_list_opt(options, 'filters', ()):
+@@ -134,7 +134,7 @@ class Lexer(object):
+ if text.startswith(u'\ufeff'):
+ text = text[len(u'\ufeff'):]
+ except UnicodeDecodeError:
+- text = text.decode('latin1')
++ text = text.decode('utf-8')
+ elif self.encoding == 'chardet':
+ try:
+ import chardet
+Index: pygments-1.1/pygments/lexers/__init__.py
+===================================================================
+--- pygments-1.1.orig/pygments/lexers/__init__.py
++++ pygments-1.1/pygments/lexers/__init__.py
+@@ -105,7 +105,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.1/pygments/formatters/other.py
+===================================================================
+--- pygments-1.1.orig/pygments/formatters/other.py
++++ pygments-1.1/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)
Modified: packages/pygments/trunk/debian/patches/series
===================================================================
--- packages/pygments/trunk/debian/patches/series 2009-09-15 17:17:32 UTC (rev 9770)
+++ packages/pygments/trunk/debian/patches/series 2009-09-15 17:36:50 UTC (rev 9771)
@@ -1,3 +1 @@
make_utf8_default.patch
-disable_ez_setup.patch
-use_jinja2_to_generate_docs.patch
Deleted: packages/pygments/trunk/debian/patches/use_jinja2_to_generate_docs.patch
===================================================================
--- packages/pygments/trunk/debian/patches/use_jinja2_to_generate_docs.patch 2009-09-15 17:17:32 UTC (rev 9770)
+++ packages/pygments/trunk/debian/patches/use_jinja2_to_generate_docs.patch 2009-09-15 17:36:50 UTC (rev 9771)
@@ -1,86 +0,0 @@
-# Use Jinja2 instead of Jinja to generate docs
-Index: pygments-1.0/docs/generate.py
-===================================================================
---- pygments-1.0.orig/docs/generate.py
-+++ pygments-1.0/docs/generate.py
-@@ -20,7 +20,7 @@ from docutils.parsers.rst import directi
- from docutils.core import publish_parts
- from docutils.writers import html4css1
-
--from jinja import from_string
-+from jinja2 import Template
-
- from pygments import highlight
- from pygments.lexers import get_lexer_by_name
-@@ -63,7 +63,7 @@ def generate_lexer_docs():
- out.append('\n' + heading + '\n' + '-'*len(heading) + '\n')
- for data in lexers:
- out.append(LEXERDOC % data)
-- return ''.join(out)
-+ return ''.join(out).decode('utf-8')
-
- def generate_formatter_docs():
- from pygments.formatters import FORMATTERS
-@@ -80,7 +80,7 @@ def generate_formatter_docs():
-
-
- ''' % (', '.join(data[1]) or 'None', ', '.join(data[2]).replace('*', '\\*') or 'None'))
-- return ''.join(out)
-+ return ''.join(out).decode('utf-8')
-
- def generate_filter_docs():
- from pygments.filters import FILTERS
-@@ -92,7 +92,7 @@ def generate_filter_docs():
- %s
- :Name: %s
- ''' % (cls.__name__, cls.__doc__, name))
-- return ''.join(out)
-+ return ''.join(out).decode('utf-8')
-
- def generate_changelog():
- fn = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
-@@ -110,7 +110,7 @@ def generate_changelog():
- else:
- result.append(line.rstrip())
- f.close()
-- return '\n'.join(result)
-+ return '\n'.join(result).decode('utf-8')
-
- def generate_authors():
- fn = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
-@@ -364,7 +364,7 @@ class DocumentationWriter(html4css1.Writ
- except IndexError:
- continue
- ref_id = reference['refid']
-- text = escape(reference.astext().encode('utf-8'))
-+ text = escape(reference.astext())
- toc.append((ref_id, text))
-
- self._generated_toc = [('#%s' % href, caption) for href, caption in toc]
-@@ -388,8 +388,8 @@ def generate_documentation(data, link_st
- }
- )
- return {
-- 'title': parts['title'].encode('utf-8'),
-- 'body': parts['body'].encode('utf-8'),
-+ 'title': parts['title'],
-+ 'body': parts['body'],
- 'toc': parts['toc']
- }
-
-@@ -421,13 +421,13 @@ def handle_python(filename, fp, dst):
- def handle_html(filename, fp, dst):
- now = datetime.now()
- title = os.path.basename(filename)[:-4]
-- content = fp.read()
-+ content = fp.read().decode('utf-8')
- c = generate_documentation(content, (lambda x: './%s.html' % x))
- result = file(os.path.join(dst, title + '.html'), 'w')
- c['style'] = STYLESHEET + PYGMENTS_FORMATTER.get_style_defs('.syntax')
- c['generation_date'] = now
- c['file_id'] = title
-- t = from_string(TEMPLATE)
-+ t = Template(TEMPLATE)
- result.write(t.render(c).encode('utf-8'))
- result.close()
-
More information about the Python-modules-commits
mailing list