[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, gismo-debian-quilt, updated. debian/0.2.0-git20080909-4-7-gf78af4c

[Luca Capello]

The following commit has been merged in the gismo-debian-quilt branch:
commit f78af4c5dcf5e48a8b6465f3722f920fd8a38f95
Author: Luca Capello <luca at pca.it>
Date:   Sun Oct 5 21:18:24 2008 +0200

    debian/patches/02_ascii-encode-in-gsm-channel.py.patch: new file.
    
    This patch is based on 8f6b1bf96759b73b98e5e210f825ce1318179cb0
    and 4f98b77542d89ccd16453904a74334a0b19d5856.

diff --git a/debian/changelog b/debian/changelog
index 82495da..c79c26e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ fso-frameworkd (0.2.0-git20080909-5) UNRELEASED; urgency=low
     + Build-Depends: on quilt.
   * debian/patches/series: new file.
   * debian/patches/01_adjust-etc-path-in-setup.py.patch: new file.
+  * debian/patches/02_ascii-encode-in-gsm-channel.py.patch: new file.
   * debian/frameworkd.conf: new file.
   * debian/fso-frameworkd.install:
     + install debian/frameworkd.conf in /etc.
diff --git a/debian/patches/02_ascii-encode-in-gsm-channel.py.patch b/debian/patches/02_ascii-encode-in-gsm-channel.py.patch
new file mode 100644
index 0000000..ff86e57
--- /dev/null
+++ b/debian/patches/02_ascii-encode-in-gsm-channel.py.patch
@@ -0,0 +1,11 @@
+--- fso-frameworkd.orig/framework/subsystems/ogsmd/gsm/channel.py
++++ fso-frameworkd/framework/subsystems/ogsmd/gsm/channel.py
+@@ -338,7 +338,7 @@
+             return False
+ 
+         logger.debug( "%s: sending %d bytes: %s" % ( repr(self), len(self.q.peek()[0]), repr(self.q.peek()[0]) ) )
+-        self.serial.write( self.q.peek()[0] ) # channel data
++        self.serial.write( self.q.peek()[0].encode('ascii') ) # channel data
+         if self.q.peek()[3]: # channel timeout
+             self.watchTimeout = gobject.timeout_add_seconds( self.q.peek()[3], self._handleCommandTimeout )
+         return False
diff --git a/debian/patches/series b/debian/patches/series
index b45f0fc..aeeb26f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_adjust-etc-path-in-setup.py.patch
+02_ascii-encode-in-gsm-channel.py.patch

-- 
FSO frameworkd Debian packaging