[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.2.0-git20080909-7-247-g80ec1e1

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit a4b382c0ac2d824ac2352ba0496b315d12865156
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 11 17:28:21 2008 +0100

    removing 03_print-ntype-error-in-const.py.patch, solved upstream

diff --git a/debian/patches/03_print-ntype-error-in-const.py.patch b/debian/patches/03_print-ntype-error-in-const.py.patch
deleted file mode 100644
index 289fa19..0000000
--- a/debian/patches/03_print-ntype-error-in-const.py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- fso-frameworkd.orig/framework/subsystems/ogsmd/gsm/const.py
-+++ fso-frameworkd/framework/subsystems/ogsmd/gsm/const.py
-@@ -13,7 +13,7 @@
- GSM constants, strings, formats, parse patterns, timeouts, you name it.
- """
- 
--import re
-+import re, sys
- from ogsmd.helpers import BiDict
- 
- import logging
-@@ -995,7 +995,10 @@
-     """
- 
-     # FIXME figure out how to decode ntype 208
--    assert ntype in ( 129, 145, 185, 208 ), "unknown type %i" % ntype
-+    if not ntype in ( 129, 145, 185, 208 ):
-+	# No logger available in this module, so I’m being lazy, this
-+	# is just a workaround anyways.
-+	print >>sys.stderr, "Unknown number type %i when reading number \"%s\"" % (ntype, nstring)
-     if ntype == 145: # should not include '+', but sometimes it does
-         if nstring[0] == '+':
-             return nstring
diff --git a/debian/patches/series b/debian/patches/series
index d9fee0c..3bb126c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01_adjust-etc-path-in-setup.py.patch
 02_ascii-encode-in-gsm-channel.py.patch
-03_print-ntype-error-in-const.py.patch
 04_correct-dbus-paths-for-gypsy.patch
 05_fix-installprefix-in-config.py.patch
 06_backport-fix-for-fso-140.patch

-- 
FSO frameworkd Debian packaging