[Python-modules-commits] r15250 - in packages/pygments/trunk/debian (5 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Tue Jan 4 22:18:03 UTC 2011
Date: Tuesday, January 4, 2011 @ 22:18:00
Author: piotr
Revision: 15250
* 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)
Modified:
packages/pygments/trunk/debian/changelog
packages/pygments/trunk/debian/control
packages/pygments/trunk/debian/patches/make_utf8_default.patch
packages/pygments/trunk/debian/rules
packages/pygments/trunk/debian/source/format
Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog 2011-01-04 00:16:46 UTC (rev 15249)
+++ packages/pygments/trunk/debian/changelog 2011-01-04 22:18:00 UTC (rev 15250)
@@ -1,3 +1,13 @@
+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
Modified: packages/pygments/trunk/debian/control
===================================================================
--- packages/pygments/trunk/debian/control 2011-01-04 00:16:46 UTC (rev 15249)
+++ packages/pygments/trunk/debian/control 2011-01-04 22:18:00 UTC (rev 15250)
@@ -4,20 +4,20 @@
Maintainer: Piotr Ożarowski <piotr at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), quilt (>=0.40)
-Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 0.6.4),
+Build-Depends-Indep: python-all (>= 2.6.6-3), python3-all, python3-setuptools,
python-setuptools (>= 0.6b3), python-docutils, python-jinja2
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://pygments.org/
-XS-Python-Version: >= 2.4
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pygments/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pygments/trunk/
+X-Python-Version: >= 2.4
Package: python-pygments
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
+Breaks: ${python:Breaks}
Recommends: python-chardet, python-pkg-resources
Suggests: ttf-bitstream-vera
-XB-Python-Version: ${python:Versions}
Description: syntax highlighting package written in Python
Pygments aims to be a generic syntax highlighter for general use in all kinds
of software such as forum systems, wikis or other applications that need to
@@ -29,3 +29,20 @@
* support for new languages and formats are added easily
* a number of output formats, presently HTML, LaTeX and ANSI sequences
* it is usable as a command-line tool and as a library
+
+Package: python3-pygments
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Recommends: python3-pkg-resources
+Suggests: ttf-bitstream-vera
+Description: syntax highlighting package written in Python 3
+ Pygments aims to be a generic syntax highlighter for general use in all kinds
+ of software such as forum systems, wikis or other applications that need to
+ prettify source code.
+ .
+ Highlights are:
+ * a wide range of common languages and markup formats is supported
+ * special attention is paid to details, increasing quality by a fair amount
+ * support for new languages and formats are added easily
+ * a number of output formats, presently HTML, LaTeX and ANSI sequences
+ * it is usable as a command-line tool and as a library
Modified: packages/pygments/trunk/debian/patches/make_utf8_default.patch
===================================================================
--- packages/pygments/trunk/debian/patches/make_utf8_default.patch 2011-01-04 00:16:46 UTC (rev 15249)
+++ packages/pygments/trunk/debian/patches/make_utf8_default.patch 2011-01-04 22:18:00 UTC (rev 15250)
@@ -4,10 +4,10 @@
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.1/pygments/cmdline.py
+Index: Pygments-1.4/pygments/cmdline.py
===================================================================
---- pygments-1.1.orig/pygments/cmdline.py
-+++ pygments-1.1/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()
@@ -33,11 +33,11 @@
# ... and do it!
try:
-Index: pygments-1.1/pygments/formatters/latex.py
+Index: Pygments-1.4/pygments/formatters/latex.py
===================================================================
---- pygments-1.1.orig/pygments/formatters/latex.py
-+++ pygments-1.1/pygments/formatters/latex.py
-@@ -299,6 +299,6 @@ class LatexFormatter(Formatter):
+--- 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,
@@ -45,11 +45,11 @@
+ encoding = self.encoding or 'utf-8',
styledefs = self.get_style_defs(),
code = outfile.getvalue()))
-Index: pygments-1.1/pygments/lexer.py
+Index: Pygments-1.4/pygments/lexer.py
===================================================================
---- pygments-1.1.orig/pygments/lexer.py
-+++ pygments-1.1/pygments/lexer.py
-@@ -56,7 +56,7 @@ class Lexer(object):
+--- 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
@@ -59,8 +59,8 @@
``'chardet'`` to use the chardet library, if it is installed.
"""
@@ -83,7 +83,7 @@ class Lexer(object):
- self.stripnl = get_bool_opt(options, 'stripnl', True)
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')
@@ -76,11 +76,11 @@
elif self.encoding == 'chardet':
try:
import chardet
-Index: pygments-1.1/pygments/lexers/__init__.py
+Index: Pygments-1.4/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
+--- 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
@@ -89,10 +89,10 @@
def get_rating(cls):
# The class _always_ defines analyse_text because it's included in
-Index: pygments-1.1/pygments/formatters/other.py
+Index: Pygments-1.4/pygments/formatters/other.py
===================================================================
---- pygments-1.1.orig/pygments/formatters/other.py
-+++ pygments-1.1/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 '
Modified: packages/pygments/trunk/debian/rules
===================================================================
--- packages/pygments/trunk/debian/rules 2011-01-04 00:16:46 UTC (rev 15249)
+++ packages/pygments/trunk/debian/rules 2011-01-04 22:18:00 UTC (rev 15250)
@@ -2,18 +2,17 @@
#export DH_VERBOSE=1
-PYVERS ?= $(shell pyversions -vr)
+PYVERS ?= $(shell pyversions -vr) $(shell py3versions -vr)
+pkgdir = $(CURDIR)/debian/python$(if $(patsubst 3.%,,$(1)),,3)-pygments
-include /usr/share/quilt/quilt.make
-
-clean: unpatch
+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: patch build-indep
+build: build-indep
build-indep:
dh_testdir
@@ -30,7 +29,7 @@
install-python%-stamp:
python$* setup.py install --single-version-externally-managed \
- --root debian/python-pygments --prefix=/usr
+ --root $(call pkgdir,$*) --install-layout=deb
touch $@
binary-indep: build install
@@ -40,11 +39,11 @@
dh_installexamples -i
dh_installdocs -i
dh_installman -i
- dh_install -i debian/pygmentize /usr/bin/
- # add jwilk's hack for one PKG-INFO file (until I will figure out why it changes)
- find debian/ -name PKG-INFO | tail -n +2 | xargs -r -n1 cp -vf $(shell find debian/ -name PKG-INFO | head -n 1)
- dh_pysupport -i
- dh_compress -i -X.py
+ 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
Modified: packages/pygments/trunk/debian/source/format
===================================================================
--- packages/pygments/trunk/debian/source/format 2011-01-04 00:16:46 UTC (rev 15249)
+++ packages/pygments/trunk/debian/source/format 2011-01-04 22:18:00 UTC (rev 15250)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list