[Python-modules-commits] r31308 - in packages/gamera/trunk/debian (3 files)

[danstender-guest at users.alioth.debian.org]

    Date: Thursday, October 30, 2014 @ 01:00:01
  Author: danstender-guest
Revision: 31308

added gendoc-version-parsing.diff (Closes: #767158)

Added:
  packages/gamera/trunk/debian/patches/gendoc-version-parsing.diff
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2014-10-29 23:17:37 UTC (rev 31307)
+++ packages/gamera/trunk/debian/changelog	2014-10-30 01:00:01 UTC (rev 31308)
@@ -1,3 +1,9 @@
+gamera (3.4.1+svn1423-2) UNRELEASED; urgency=medium
+
+  * Added gendoc-version-parsing.diff (Closes: #767158).
+
+ -- Daniel Stender <debian at danielstender.com>  Thu, 30 Oct 2014 01:40:29 +0100
+
 gamera (3.4.1+svn1423-1) unstable; urgency=medium
 
   * Updated source to SVN rev. 1423.

Added: packages/gamera/trunk/debian/patches/gendoc-version-parsing.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gendoc-version-parsing.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/gendoc-version-parsing.diff	2014-10-30 01:00:01 UTC (rev 31308)
@@ -0,0 +1,29 @@
+Description: fix invalid version number ValueError
+ the 'anarchic' version numbering of Pygments (currently in Sid: '2.0r1') doesn't
+ fit into the needs for distutils.version.StrictVersion. LooseVersion isn't perfect,
+ but fulfills what's needed here to make it run.
+Author: Daniel Stender <debian at danielstender.com>
+Bug: http://bugs.debian.org/767158
+Forwarded: no
+Last-Update: 2014-10-29
+
+--- a/gamera/gendoc.py
++++ b/gamera/gendoc.py
+@@ -29,7 +29,7 @@
+ import locale
+ import traceback
+ import warnings
+-from distutils.version import StrictVersion
++from distutils.version import StrictVersion, LooseVersion
+ from gamera.util import dedent
+ try:
+    locale.setlocale(locale.LC_ALL, '')
+@@ -57,7 +57,7 @@
+    import pygments.lexers
+    import pygments.formatters
+    source_highlighter = 'pygments'
+-   if StrictVersion(pygments.__version__) < StrictVersion('0.6'):
++   if LooseVersion(pygments.__version__) < LooseVersion('0.6'):
+       print "pygments version (" + pygments.__version__ + ") too old"
+       raise ImportError()
+ except ImportError, e:

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2014-10-29 23:17:37 UTC (rev 31307)
+++ packages/gamera/trunk/debian/patches/series	2014-10-30 01:00:01 UTC (rev 31308)
@@ -10,3 +10,4 @@
 trap-errors-from-pclose.diff
 fix-typos.diff
 avoid_mktemp.diff
+gendoc-version-parsing.diff