[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 83356edeaa14681c01a5be58dfff78033eee77c7
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Jan 7 23:42:40 2009 +0100

    ogsmd: move dbus error module one level up

diff --git a/framework/subsystems/ogsmd/gsm/error.py b/framework/subsystems/ogsmd/error.py
similarity index 100%
rename from framework/subsystems/ogsmd/gsm/error.py
rename to framework/subsystems/ogsmd/error.py
diff --git a/framework/subsystems/ogsmd/modems/abstract/calling.py b/framework/subsystems/ogsmd/modems/abstract/calling.py
index ce81fb7..7708956 100644
--- a/framework/subsystems/ogsmd/modems/abstract/calling.py
+++ b/framework/subsystems/ogsmd/modems/abstract/calling.py
@@ -2,8 +2,8 @@
 """
 freesmartphone.org ogsmd - Python Implementation
 
-(C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
-(C) 2008 Openmoko, Inc.
+(C) 2008-2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2008-2009 Openmoko, Inc.
 GPLv2 or later
 
 Package: ogsmd.modems.abstract
@@ -15,7 +15,8 @@ New style abstract call handling
 __version__ = "0.9.1.2"
 MODULE_NAME = "ogsmd.callhandler"
 
-from ogsmd.gsm import error, const
+from ogsmd import error
+from ogsmd.gsm import const
 
 import logging
 logger = logging.getLogger( MODULE_NAME )
diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index 009afbc..686b07a 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -25,7 +25,8 @@ TODO:
 __version__ = "0.9.11.1"
 MODULE_NAME = "ogsmd.modems.abstract.mediator"
 
-from ogsmd.gsm import error, const, convert
+from ogsmd import error
+from ogsmd.gsm import const, convert
 from ogsmd.gsm.decor import logged
 from ogsmd.helpers import safesplit
 from ogsmd.modems import currentModem

-- 
FSO frameworkd Debian packaging