[pkg-freevo-commits] r198 - in packages/kaa-base/trunk/debian: . patches

[Andrea Mennucci]

Author: mennucc1
Date: 2010-03-13 17:03:37 +0000 (Sat, 13 Mar 2010)
New Revision: 198

Removed:
   packages/kaa-base/trunk/debian/002_ia64_libc.patch
Modified:
   packages/kaa-base/trunk/debian/changelog
   packages/kaa-base/trunk/debian/patches/002_ia64_libc.patch
Log:
kaa-base (0.6.0-4) really put patch were it is used

Deleted: packages/kaa-base/trunk/debian/002_ia64_libc.patch
===================================================================
--- packages/kaa-base/trunk/debian/002_ia64_libc.patch	2010-03-13 15:22:09 UTC (rev 197)
+++ packages/kaa-base/trunk/debian/002_ia64_libc.patch	2010-03-13 17:03:37 UTC (rev 198)
@@ -1,40 +0,0 @@
-Index: kaa-base-0.6.0/src/process.py
-===================================================================
---- kaa-base-0.6.0.orig/src/process.py	2010-03-12 18:08:10.000000000 +0100
-+++ kaa-base-0.6.0/src/process.py	2010-03-12 18:09:06.000000000 +0100
-@@ -28,6 +28,7 @@
- 
- import subprocess
- import os
-+import sys
- import shlex
- import errno
- import logging
-@@ -68,17 +69,18 @@
-         #
-         # Therefore the purpose of signal.set_wakeup_fd() eludes me, since
-         # select calls get interrupted, there is no need to wake it up.
--        try:
-+        v = sys.version_info
-+        if v[0] >= 3 or (v[0] == 2 and v[1] >= 6):
-             # Python 2.6+
-             signal.siginterrupt(signal.SIGCHLD, False)
--        except AttributeError:
--            try:
--                # Python 2.5
--                import ctypes
--                ctypes.CDLL("libc.so.6").siginterrupt(signal.SIGCHLD, 0)
--            except (ImportError, OSError):
--                # Python 2.4- is not supported.
--                raise SystemError('kaa.base requires Python 2.5 or later')
-+        elif v[0] == 2 and v[1] == 5:
-+            # Python 2.5
-+            import ctypes
-+            libc=ctypes.util.find_library('c')
-+            ctypes.CDLL(libc).siginterrupt(signal.SIGCHLD, 0)
-+        else:
-+            # Python 2.4- is not supported.
-+            raise SystemError('kaa.base requires Python 2.5 or later')
-         
- 
-     def register(self, process):

Modified: packages/kaa-base/trunk/debian/changelog
===================================================================
--- packages/kaa-base/trunk/debian/changelog	2010-03-13 15:22:09 UTC (rev 197)
+++ packages/kaa-base/trunk/debian/changelog	2010-03-13 17:03:37 UTC (rev 198)
@@ -1,3 +1,10 @@
+kaa-base (0.6.0-4) unstable; urgency=low
+
+  * REALLY use ctypes.util.find_library to find libc,
+    thanks KiBi, closes: #566902.
+  
+ -- A Mennucc1 <mennucc1 at debian.org>  Sat, 13 Mar 2010 17:43:43 +0100
+
 kaa-base (0.6.0-3) unstable; urgency=low
 
   * Bump standard to 3.8.4, no change

Modified: packages/kaa-base/trunk/debian/patches/002_ia64_libc.patch
===================================================================
--- packages/kaa-base/trunk/debian/patches/002_ia64_libc.patch	2010-03-13 15:22:09 UTC (rev 197)
+++ packages/kaa-base/trunk/debian/patches/002_ia64_libc.patch	2010-03-13 17:03:37 UTC (rev 198)
@@ -1,7 +1,7 @@
-Index: kaa-base/src/process.py
+Index: kaa-base-0.6.0/src/process.py
 ===================================================================
---- kaa-base/src/process.py	(revisione 4281)
-+++ kaa-base/src/process.py	(copia locale)
+--- kaa-base-0.6.0.orig/src/process.py	2009-05-25 22:47:25.000000000 +0200
++++ kaa-base-0.6.0/src/process.py	2010-03-13 17:57:05.000000000 +0100
 @@ -28,6 +28,7 @@
  
  import subprocess
@@ -10,7 +10,7 @@
  import shlex
  import errno
  import logging
-@@ -70,17 +71,20 @@
+@@ -68,17 +69,18 @@
          #
          # Therefore the purpose of signal.set_wakeup_fd() eludes me, since
          # select calls get interrupted, there is no need to wake it up.
@@ -30,9 +30,7 @@
 +        elif v[0] == 2 and v[1] == 5:
 +            # Python 2.5
 +            import ctypes
-+            libc="libc.so.6"
-+            if not os.path.exists('/lib/'+libc): #ia64
-+                libc="libc.so.6.1"
++            libc=ctypes.util.find_library('c')
 +            ctypes.CDLL(libc).siginterrupt(signal.SIGCHLD, 0)
 +        else:
 +            # Python 2.4- is not supported.