[pkg-freevo-commits] r191 - in packages/kaa-base/trunk/debian: . source

[Andrea Mennucci]

Author: mennucc1
Date: 2010-03-12 17:24:31 +0000 (Fri, 12 Mar 2010)
New Revision: 191

Added:
   packages/kaa-base/trunk/debian/002_ia64_libc.patch
   packages/kaa-base/trunk/debian/source/
   packages/kaa-base/trunk/debian/source/format
Modified:
   packages/kaa-base/trunk/debian/changelog
   packages/kaa-base/trunk/debian/control
Log:
kaa-base (0.6.0-3)

Added: packages/kaa-base/trunk/debian/002_ia64_libc.patch
===================================================================
--- packages/kaa-base/trunk/debian/002_ia64_libc.patch	                        (rev 0)
+++ packages/kaa-base/trunk/debian/002_ia64_libc.patch	2010-03-12 17:24:31 UTC (rev 191)
@@ -0,0 +1,40 @@
+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-02-06 14:29:29 UTC (rev 190)
+++ packages/kaa-base/trunk/debian/changelog	2010-03-12 17:24:31 UTC (rev 191)
@@ -1,3 +1,12 @@
+kaa-base (0.6.0-3) unstable; urgency=low
+
+  * Bump standard to 3.8.4, no change
+  * Add misc:depends 
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Use ctypes.util.find_library to find libc, thanks KiBi, closes: #566902.
+
+ -- A Mennucc1 <mennucc1 at debian.org>  Fri, 12 Mar 2010 18:11:13 +0100
+
 kaa-base (0.6.0-2) unstable; urgency=low
 
   * libc6 is /lib/libc6.so.6.1 in IA64 (Closes: #559633).

Modified: packages/kaa-base/trunk/debian/control
===================================================================
--- packages/kaa-base/trunk/debian/control	2010-02-06 14:29:29 UTC (rev 190)
+++ packages/kaa-base/trunk/debian/control	2010-03-12 17:24:31 UTC (rev 191)
@@ -7,12 +7,12 @@
 XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/kaa-base/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-freevo/kaa-base/
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
 Homepage: http://freevo.org/kaa
 
 Package: python-kaa-base
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-sqlite
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-sqlite
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Description: Base Kaa Framework for all Kaa Modules

Added: packages/kaa-base/trunk/debian/source/format
===================================================================
--- packages/kaa-base/trunk/debian/source/format	                        (rev 0)
+++ packages/kaa-base/trunk/debian/source/format	2010-03-12 17:24:31 UTC (rev 191)
@@ -0,0 +1 @@
+3.0 (quilt)