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

[Andrea Mennucci]

Author: mennucc1
Date: 2009-12-07 21:02:47 +0000 (Mon, 07 Dec 2009)
New Revision: 175

Added:
   packages/kaa-base/trunk/debian/patches/002_ia64_libc.patch
Modified:
   packages/kaa-base/trunk/debian/changelog
   packages/kaa-base/trunk/debian/control
   packages/kaa-base/trunk/debian/patches/series
Log:
kaa-base 0.6.0-2 : changes for IA64

Modified: packages/kaa-base/trunk/debian/changelog
===================================================================
--- packages/kaa-base/trunk/debian/changelog	2009-11-06 23:25:58 UTC (rev 174)
+++ packages/kaa-base/trunk/debian/changelog	2009-12-07 21:02:47 UTC (rev 175)
@@ -1,3 +1,10 @@
+kaa-base (0.6.0-2) unstable; urgency=low
+
+  * libc6 is /lib/libc6.so.6.1 in IA64 (Closes: #559633).
+  * Add myself to uploaders.
+
+ -- A Mennucc1 <mennucc1 at debian.org>  Mon, 07 Dec 2009 21:48:59 +0100
+
 kaa-base (0.6.0-1) unstable; urgency=low
 
   * New version.

Modified: packages/kaa-base/trunk/debian/control
===================================================================
--- packages/kaa-base/trunk/debian/control	2009-11-06 23:25:58 UTC (rev 174)
+++ packages/kaa-base/trunk/debian/control	2009-12-07 21:02:47 UTC (rev 175)
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Freevo Debian Dream Team <pkg-freevo-maint at lists.alioth.debian.org>
-Uploaders: Jeremie Corbier <jeremie.corbier at resel.enst-bretagne.fr>, Georg W. Leonhardt <repo at geole.info>
+Uploaders: Jeremie Corbier <jeremie.corbier at resel.enst-bretagne.fr>, Georg W. Leonhardt <repo at geole.info>, A Mennucc1 <mennucc1 at debian.org>
 Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5.0.37.2), quilt, python-all-dev (>= 2.3.5-11), python-central (>= 0.5), libglib2.0-dev (>= 2.6)
 XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/pkg-freevo/kaa-base/

Added: packages/kaa-base/trunk/debian/patches/002_ia64_libc.patch
===================================================================
--- packages/kaa-base/trunk/debian/patches/002_ia64_libc.patch	                        (rev 0)
+++ packages/kaa-base/trunk/debian/patches/002_ia64_libc.patch	2009-12-07 21:02:47 UTC (rev 175)
@@ -0,0 +1,42 @@
+Index: kaa-base/src/process.py
+===================================================================
+--- kaa-base/src/process.py	(revisione 4281)
++++ kaa-base/src/process.py	(copia locale)
+@@ -28,6 +28,7 @@
+ 
+ import subprocess
+ import os
++import sys
+ import shlex
+ import errno
+ import logging
+@@ -70,17 +71,20 @@
+         #
+         # 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="libc.so.6"
++            if not os.path.exists('/lib/'+libc): #ia64
++                libc="libc.so.6.1"
++            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/patches/series
===================================================================
--- packages/kaa-base/trunk/debian/patches/series	2009-11-06 23:25:58 UTC (rev 174)
+++ packages/kaa-base/trunk/debian/patches/series	2009-12-07 21:02:47 UTC (rev 175)
@@ -1 +1,2 @@
 #001_remove-useless-shebangs.patch
+002_ia64_libc.patch