[Python-modules-commits] r23433 - in packages/pygments/trunk/debian (5 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sun Feb 3 22:05:19 UTC 2013 

    Date: Sunday, February 3, 2013 @ 22:05:15
  Author: piotr
Revision: 23433

* New upstream release
* fix_makefile_re.patch removed, no longer needed
* debian/watch file updated to handle rc versions correctly

Modified:
  packages/pygments/trunk/debian/changelog
  packages/pygments/trunk/debian/patches/make_utf8_default.patch
  packages/pygments/trunk/debian/patches/series
  packages/pygments/trunk/debian/watch
Deleted:
  packages/pygments/trunk/debian/patches/fix_makefile_re.patch

Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog	2013-02-03 21:29:45 UTC (rev 23432)
+++ packages/pygments/trunk/debian/changelog	2013-02-03 22:05:15 UTC (rev 23433)
@@ -1,3 +1,11 @@
+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 ]

Deleted: packages/pygments/trunk/debian/patches/fix_makefile_re.patch
===================================================================
--- packages/pygments/trunk/debian/patches/fix_makefile_re.patch	2013-02-03 21:29:45 UTC (rev 23432)
+++ packages/pygments/trunk/debian/patches/fix_makefile_re.patch	2013-02-03 22:05:15 UTC (rev 23433)
@@ -1,17 +0,0 @@
-Author: Ken Wu <ken.wu at ruckuswireless.com>
-Description: Fixed regular expressions for assignment in BaseMakefileLexer.
-Origin: upstream; https://bitbucket.org/birkenfeld/pygments-main/changeset/c2c8279ef670
-
-diff -r bed423abed70 -r b79e4674bc30 pygments/lexers/text.py
---- a/pygments/lexers/text.py	Tue Aug 14 00:40:51 2012 +0900
-+++ b/pygments/lexers/text.py	Thu Aug 16 15:57:51 2012 +0800
-@@ -187,7 +187,7 @@
-              bygroups(Keyword, Text), 'export'),
-             (r'export\s+', Keyword),
-             # assignment
--            (r'([a-zA-Z0-9_${}.-]+)(\s*)([!?:+]?=)([ \t]*)((?:.*\\\n|.*\n)+)',
-+            (r'([a-zA-Z0-9_${}.-]+)(\s*)([!?:+]?=)([ \t]*)((?:.*\\\n)+|.*\n)',
-              bygroups(Name.Variable, Text, Operator, Text, using(BashLexer))),
-             # strings
-             (r'(?s)"(\\\\|\\.|[^"\\])*"', String.Double),
-

Modified: packages/pygments/trunk/debian/patches/make_utf8_default.patch
===================================================================
--- packages/pygments/trunk/debian/patches/make_utf8_default.patch	2013-02-03 21:29:45 UTC (rev 23432)
+++ packages/pygments/trunk/debian/patches/make_utf8_default.patch	2013-02-03 22:05:15 UTC (rev 23433)
@@ -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.5/pygments/formatters/latex.py
+Index: pygments-1.6+dfsg/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):
+--- pygments-1.6+dfsg.orig/pygments/formatters/latex.py
++++ pygments-1.6+dfsg/pygments/formatters/latex.py
+@@ -373,6 +373,6 @@ class LatexFormatter(Formatter):
                  dict(docclass  = self.docclass,
                       preamble  = self.preamble,
                       title     = self.title,
@@ -16,10 +16,10 @@
 +                     encoding  = self.encoding or 'utf-8',
                       styledefs = self.get_style_defs(),
                       code      = outfile.getvalue()))
-Index: pygments-1.5/pygments/lexer.py
+Index: pygments-1.6+dfsg/pygments/lexer.py
 ===================================================================
---- pygments-1.5.orig/pygments/lexer.py
-+++ pygments-1.5/pygments/lexer.py
+--- pygments-1.6+dfsg.orig/pygments/lexer.py
++++ pygments-1.6+dfsg/pygments/lexer.py
 @@ -61,7 +61,7 @@ class Lexer(object):
      ``encoding``
          If given, must be an encoding name. This encoding will be used to
@@ -29,7 +29,7 @@
          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):
+@@ -92,7 +92,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)
@@ -38,10 +38,10 @@
          # 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
+Index: pygments-1.6+dfsg/pygments/lexers/__init__.py
 ===================================================================
---- pygments-1.5.orig/pygments/lexers/__init__.py
-+++ pygments-1.5/pygments/lexers/__init__.py
+--- pygments-1.6+dfsg.orig/pygments/lexers/__init__.py
++++ pygments-1.6+dfsg/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):
@@ -51,10 +51,10 @@
  
      def get_rating(info):
          cls, filename = info
-Index: pygments-1.5/pygments/formatters/other.py
+Index: pygments-1.6+dfsg/pygments/formatters/other.py
 ===================================================================
---- pygments-1.5.orig/pygments/formatters/other.py
-+++ pygments-1.5/pygments/formatters/other.py
+--- pygments-1.6+dfsg.orig/pygments/formatters/other.py
++++ pygments-1.6+dfsg/pygments/formatters/other.py
 @@ -64,7 +64,7 @@ class RawTokenFormatter(Formatter):
          if self.encoding:
              raise OptionError('the raw formatter does not support the '
@@ -64,11 +64,11 @@
          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
+Index: pygments-1.6+dfsg/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):
+--- pygments-1.6+dfsg.orig/pygments/cmdline.py
++++ pygments-1.6+dfsg/pygments/cmdline.py
+@@ -402,20 +402,20 @@ def main(args=sys.argv):
          else:
              code = sys.stdin.read()
  

Modified: packages/pygments/trunk/debian/patches/series
===================================================================
--- packages/pygments/trunk/debian/patches/series	2013-02-03 21:29:45 UTC (rev 23432)
+++ packages/pygments/trunk/debian/patches/series	2013-02-03 22:05:15 UTC (rev 23433)
@@ -1,2 +1 @@
 make_utf8_default.patch
-fix_makefile_re.patch

Modified: packages/pygments/trunk/debian/watch
===================================================================
--- packages/pygments/trunk/debian/watch	2013-02-03 21:29:45 UTC (rev 23432)
+++ packages/pygments/trunk/debian/watch	2013-02-03 22:05:15 UTC (rev 23433)
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
+opts=dversionmangle=s/\+dfsg//,uversionmangle=s/(beta|rc|a|b|c)/~$1/ \
 http://pypi.python.org/packages/source/P/Pygments/Pygments-(.*)\.tar\.gz

More information about the Python-modules-commits mailing list