tags 651865 + pending
thanks

Dear maintainer,

I've prepared an NMU for python-gnutls (versioned as 1.2.0-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Peter Jones: Hooked onto your love
diff -u python-gnutls-1.2.0/debian/changelog python-gnutls-1.2.0/debian/changelog
--- python-gnutls-1.2.0/debian/changelog
+++ python-gnutls-1.2.0/debian/changelog
@@ -1,3 +1,11 @@
+python-gnutls (1.2.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "gnutls.library.functions fails with libgnutls28-3.0.8-2":
+    apply patch taken from upstream 1.2.4 release. (Closes: #651865)
+
+ -- gregor herrmann <gre...@debian.org>  Sat, 03 Mar 2012 15:05:46 +0100
+
 python-gnutls (1.2.0-2) unstable; urgency=low
 
   * Depend on libgnutls26 as the library is used via ctypes now.
only in patch2:
unchanged:
--- python-gnutls-1.2.0.orig/gnutls/library/__init__.py
+++ python-gnutls-1.2.0/gnutls/library/__init__.py
@@ -15,39 +15,29 @@
 
 def library_locations(name, version):
     import os
-    from ctypes.util import find_library
-    
+
     system = get_system_name()
     if system == 'darwin':
         library_name = 'lib%s.%d.dylib' % (name, version)
-        library_alias = 'lib%s.dylib' % name
-        search_name = name
+        dynamic_loader_env_vars = ['DYLD_LIBRARY_PATH', 'LD_LIBRARY_PATH']
         additional_paths = ['/usr/local/lib', '/opt/local/lib', '/sw/lib']
     elif system == 'windows':
         library_name = 'lib%s-%d.dll' % (name, version)
-        library_alias = 'lib%s.dll' % name
-        search_name = 'lib%s-%d' % (name, version)
-        additional_paths = []
+        dynamic_loader_env_vars = ['PATH']
+        additional_paths = ['.']
     elif system == 'cygwin':
         library_name = 'cyg%s-%d.dll' % (name, version)
-        library_alias = 'cyg%s.dll' % name
-        search_name = 'cyg%s-%d' % (name, version)
+        dynamic_loader_env_vars = ['LD_LIBRARY_PATH']
         additional_paths = ['/usr/bin']
     else:
         library_name = 'lib%s.so.%d' % (name, version)
-        library_alias = 'lib%s.so' % name
-        search_name = name
+        dynamic_loader_env_vars = ['LD_LIBRARY_PATH']
         additional_paths = ['/usr/local/lib']
-    library = find_library(search_name)
-    if library is not None:
-        yield library
-    library = find_library(library_name)
-    if library is not None:
-        yield library
-    for path in additional_paths:
+    for path in (path for env_var in dynamic_loader_env_vars for path in os.environ.get(env_var, '').split(':') if os.path.isdir(path)):
         yield os.path.join(path, library_name)
+    yield library_name
     for path in additional_paths:
-        yield os.path.join(path, library_alias)
+        yield os.path.join(path, library_name)
 
 
 def load_library(name, version):

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Python-modules-team mailing list
Python-modules-team@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to