r2941 - in van.pydeb/trunk/debian (4 files)

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

    Date: Monday, June 22, 2015 @ 16:09:09
  Author: menesis-guest
Revision: 2941

* Sync from Ubuntu to fix other packages FTBFS. Closes: #788697, #779324
* Don't rely on pkg_resources.component_re. Use a local copy.

Added:
  van.pydeb/trunk/debian/patches/
  van.pydeb/trunk/debian/patches/series
  van.pydeb/trunk/debian/patches/setuptools-fix.diff
Modified:
  van.pydeb/trunk/debian/changelog

Modified: van.pydeb/trunk/debian/changelog
===================================================================
--- van.pydeb/trunk/debian/changelog	2015-06-22 15:53:22 UTC (rev 2940)
+++ van.pydeb/trunk/debian/changelog	2015-06-22 16:09:09 UTC (rev 2941)
@@ -1,3 +1,13 @@
+van.pydeb (1.3.3-2) UNRELEASED; urgency=medium
+
+  [ Gediminas Paulauskas ]
+  * Sync from Ubuntu to fix other packages FTBFS. Closes: #788697, #779324
+
+  [ Matthias Klose ]
+  * Don't rely on pkg_resources.component_re. Use a local copy.
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Mon, 22 Jun 2015 19:04:02 +0300
+
 van.pydeb (1.3.3-1) unstable; urgency=low
 
   * Team upload.

Added: van.pydeb/trunk/debian/patches/series
===================================================================
--- van.pydeb/trunk/debian/patches/series	                        (rev 0)
+++ van.pydeb/trunk/debian/patches/series	2015-06-22 16:09:09 UTC (rev 2941)
@@ -0,0 +1 @@
+setuptools-fix.diff

Added: van.pydeb/trunk/debian/patches/setuptools-fix.diff
===================================================================
--- van.pydeb/trunk/debian/patches/setuptools-fix.diff	                        (rev 0)
+++ van.pydeb/trunk/debian/patches/setuptools-fix.diff	2015-06-22 16:09:09 UTC (rev 2941)
@@ -0,0 +1,18 @@
+Index: b/van/pydeb/__init__.py
+===================================================================
+--- a/van/pydeb/__init__.py
++++ b/van/pydeb/__init__.py
+@@ -15,9 +15,12 @@ import sys
+ import os.path
+ import optparse
+ import logging
++import re
+ 
+ from pkg_resources import PathMetadata, Distribution
+-from pkg_resources import component_re # Is this a public interface?
++# from pkg_resources import component_re # Is this a public interface?
++#   ... no, it is not!
++component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
+ 
+ _HERE = os.path.dirname(__file__)
+