[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. milestone4-138-g4cc221c

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 4cc221c18a921cf972d922148b7f12a47b4a9c7e
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Nov 15 15:53:20 2008 +0100

    Revert "Patch 07_do-not-use-ctypes.patch"
    
    This reverts commit 4676305469c4c95acfde566c92b7bf5f6db73b0b.

diff --git a/debian/changelog b/debian/changelog
index 233aef9..fa94684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ fso-frameworkd (0.8.4.3-1) UNRELEASED; urgency=low
   * Removed 03_print-ntype-error-in-const.py.patch (solved upstream)
   * Added 06_persist-in-var-lib: Put persistent data in
     /var/lib/freesmartphone
-  * Added 07_do-not-use-ctypes.patch to work around debian bug #505318
 
  -- Joachim Breitner <nomeata at debian.org>  Tue, 11 Nov 2008 16:59:56 +0100
 
diff --git a/debian/patches/07_do-not-use-ctypes.patch b/debian/patches/07_do-not-use-ctypes.patch
deleted file mode 100644
index baaa395..0000000
--- a/debian/patches/07_do-not-use-ctypes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-This is a work-around for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505318
---- frameworkd.orig/framework/subsystems/odeviced/input.py
-+++ frameworkd/framework/subsystems/odeviced/input.py
-@@ -10,8 +10,9 @@
- MODULE_NAME = "odeviced.input"
- __version__ = "0.9.9.3"
- 
--from pyglet.linux_const import EV_ABS
--from pyglet.linux import input_device_supports_event_type
-+#from pyglet.linux_const import EV_ABS
-+#from pyglet.linux import input_device_supports_event_type
-+from sys_input import input_device_num_supports_ABS
- 
- from framework.patterns import asyncworker
- from helpers import DBUS_INTERFACE_PREFIX, DBUS_PATH_PREFIX, readFromFile, writeToFile, cleanObjectName
-@@ -68,7 +69,7 @@
-                 break
-             else:
-                 # Ignore input devices spitting out absolute data (touchscreen, mouse, et. al)
--                if input_device_supports_event_type( f, EV_ABS ):
-+                if input_device_num_supports_ABS( i ):
-                     logger.info( "skipping input node %d due to it supporting EV_ABS" % ( i ) )
-                     os.close( f )
-                     continue
---- /dev/null
-+++ frameworkd/framework/subsystems/odeviced/sys_input.py
-@@ -0,0 +1,16 @@
-+#!/usr/bin/env python
-+"""
-+Helper to read information from /sys/class/input
-+
-+(C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
-+(C) 2008 Openmoko, Inc.
-+GPLv2 or later
-+"""
-+
-+def input_device_num_supports_ABS( i ):
-+    f = file ("/sys/class/input/input%d/uevent" % i)
-+    for line in f:
-+        if line.startswith('ABS=='):
-+            return True
-+    return False
-+
diff --git a/debian/patches/series b/debian/patches/series
index 3717e8d..2ab6e9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
 04_correct-dbus-paths-for-gypsy.patch
 05_fix-installprefix-in-config.py.patch
 06_persist-in-var-lib.patch
-07_do-not-use-ctypes.patch

-- 
FSO frameworkd Debian packaging