[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819
Sebastian Krzyszkowiak
seba.dos1 at gmail.com
Sat Aug 6 08:17:31 UTC 2011
The following commit has been merged in the debian branch:
commit 68130075b46b745576e453951a7500a99f446351
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date: Sun Jul 19 17:53:50 2009 +0200
opimd: little cleanup, copyrights, pypimd -> opimd
diff --git a/framework/subsystems/opimd/__init__.py b/framework/subsystems/opimd/__init__.py
index b7b8ebd..d2d29e4 100755
--- a/framework/subsystems/opimd/__init__.py
+++ b/framework/subsystems/opimd/__init__.py
@@ -3,7 +3,9 @@
Open PIM Daemon
(C) 2008 by Soeren Apel <abraxa at dar-clan.de>
-(C) 2008 Openmoko, Inc.
+(C) 2008-2009 Openmoko, Inc.
+(C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2009 by Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
GPLv2 or later
Framework plugin factory
diff --git a/framework/subsystems/opimd/backend_manager.py b/framework/subsystems/opimd/backend_manager.py
index a0f5233..cd6df84 100644
--- a/framework/subsystems/opimd/backend_manager.py
+++ b/framework/subsystems/opimd/backend_manager.py
@@ -3,7 +3,9 @@
Open PIM Daemon
(C) 2008 by Soeren Apel <abraxa at dar-clan.de>
-(C) 2008 Openmoko, Inc.
+(C) 2008-2009 Openmoko, Inc.
+(C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2009 by Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
GPLv2 or later
Backend plugin manager
@@ -41,7 +43,6 @@ PIMB_STATUS_CONNECTED = 1
_DBUS_PATH_SOURCES = DBUS_PATH_BASE_FSO + '/Sources'
_DIN_SOURCES = DIN_BASE_FSO + '.Sources'
_DIN_SOURCE = DIN_BASE_FSO + '.Source'
-ENV_MODE = 'FSO'
#----------------------------------------------------------------------------#
class BackendMetaClass(type):
diff --git a/framework/subsystems/opimd/domain_manager.py b/framework/subsystems/opimd/domain_manager.py
index faffabf..224c069 100644
--- a/framework/subsystems/opimd/domain_manager.py
+++ b/framework/subsystems/opimd/domain_manager.py
@@ -6,6 +6,8 @@
# http://pyneo.org/
#
# Copyright (C) 2008 by Soeren Apel (abraxa at dar-clan.de)
+# Copyright (C) 2008-2009 by Openmoko, Inc.
+# Copyright (C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/framework/subsystems/opimd/helpers.py b/framework/subsystems/opimd/helpers.py
index b84bde0..4c2e456 100644
--- a/framework/subsystems/opimd/helpers.py
+++ b/framework/subsystems/opimd/helpers.py
@@ -5,6 +5,7 @@ Open PIM Daemon
(C) 2008 by Soeren Apel <abraxa at dar-clan.de>
(C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
(C) 2008-2009 Openmoko, Inc.
+(C) 2009 Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
GPLv2 or later
Helpers
diff --git a/framework/subsystems/opimd/opimd.py b/framework/subsystems/opimd/opimd.py
index 26e8cad..ea53bb6 100644
--- a/framework/subsystems/opimd/opimd.py
+++ b/framework/subsystems/opimd/opimd.py
@@ -28,7 +28,3 @@ DIN_BASE_FSO = "org.freesmartphone.PIM"
DBUS_PATH_BASE = None
DIN_BASE = None
-
-# ENV_MODE is either "pyneo" or "FSO", depending on the runtime environment
-ENV_MODE = None
-
diff --git a/framework/subsystems/opimd/pimb_ogsmd_calls.py b/framework/subsystems/opimd/pimb_ogsmd_calls.py
index 7fe020b..622451b 100644
--- a/framework/subsystems/opimd/pimb_ogsmd_calls.py
+++ b/framework/subsystems/opimd/pimb_ogsmd_calls.py
@@ -5,8 +5,7 @@
#
# http://openmoko.org/
#
-# Copyright (C) 2009 by Thomas "Heinervdm" Zimmermann (zimmermann at vdm-design.de)
-# Sebastian dos Krzyszkowiak (seba.dos1 at gmail.com)
+# Copyright (C) 2009 by Sebastian dos Krzyszkowiak (seba.dos1 at gmail.com)
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +22,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-#"""pypimd ogsmd-calls Backend Plugin"""
+"""opimd ogsmd-calls Backend Plugin"""
from dbus import SystemBus
import time
diff --git a/framework/subsystems/opimd/pimb_sim_contacts_fso.py b/framework/subsystems/opimd/pimb_sim_contacts_fso.py
index 4786421..b537b73 100644
--- a/framework/subsystems/opimd/pimb_sim_contacts_fso.py
+++ b/framework/subsystems/opimd/pimb_sim_contacts_fso.py
@@ -7,6 +7,7 @@
# http://pyneo.org/
#
# Copyright (C) 2008 by Soeren Apel (abraxa at dar-clan.de)
+# Copyright (C) 2009 by Sebastian Krzyszkowiak (seba.dos1 at gmail.com)
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-"""pypimd SIM-Contacts Backend Plugin for FSO"""
+"""opimd SIM-Contacts Backend Plugin for FSO"""
from dbus import SystemBus
from dbus.proxies import Interface
diff --git a/framework/subsystems/opimd/pimb_sim_messages_fso.py b/framework/subsystems/opimd/pimb_sim_messages_fso.py
index 8e688e5..8d267ef 100644
--- a/framework/subsystems/opimd/pimb_sim_messages_fso.py
+++ b/framework/subsystems/opimd/pimb_sim_messages_fso.py
@@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-"""pypimd SIM-Messages Backend Plugin for FSO"""
+"""opimd SIM-Messages Backend Plugin for FSO"""
from dbus import SystemBus
from dbus.proxies import Interface
diff --git a/framework/subsystems/opimd/pimb_sqlite_calls.py b/framework/subsystems/opimd/pimb_sqlite_calls.py
index 18c7af3..d108c41 100644
--- a/framework/subsystems/opimd/pimb_sqlite_calls.py
+++ b/framework/subsystems/opimd/pimb_sqlite_calls.py
@@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-#"""pypimd SQLite-calls Backend Plugin"""
+"""opimd SQLite-Calls Backend Plugin"""
import os
import sqlite3
diff --git a/framework/subsystems/opimd/pimb_sqlite_contacts.py b/framework/subsystems/opimd/pimb_sqlite_contacts.py
index c05b678..7d46310 100644
--- a/framework/subsystems/opimd/pimb_sqlite_contacts.py
+++ b/framework/subsystems/opimd/pimb_sqlite_contacts.py
@@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-#"""pypimd SQLite-Contacts Backend Plugin"""
+"""opimd SQLite-Contacts Backend Plugin"""
import os
import sqlite3
diff --git a/framework/subsystems/opimd/pimb_sqlite_messages.py b/framework/subsystems/opimd/pimb_sqlite_messages.py
index afc57c4..8065c7e 100644
--- a/framework/subsystems/opimd/pimb_sqlite_messages.py
+++ b/framework/subsystems/opimd/pimb_sqlite_messages.py
@@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-#"""pypimd SQLite-Messages Backend Plugin"""
+"""opimd SQLite-Messages Backend Plugin"""
import os
import sqlite3
diff --git a/framework/subsystems/opimd/pimd_calls.py b/framework/subsystems/opimd/pimd_calls.py
index bada21f..d3afa87 100644
--- a/framework/subsystems/opimd/pimd_calls.py
+++ b/framework/subsystems/opimd/pimd_calls.py
@@ -5,6 +5,7 @@ Open PIM Daemon
(C) 2008 by Soeren Apel <abraxa at dar-clan.de>
(C) 2008 Openmoko, Inc.
+(C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
(C) 2009 by Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
GPLv2 or later
@@ -41,7 +42,6 @@ _MIN_MATCH_TRESHOLD = 0.75
_DBUS_PATH_CALLS = DBUS_PATH_BASE_FSO + '/' + _DOMAIN_NAME
_DIN_CALLS_BASE = DIN_BASE_FSO
-ENV_MODE = 'FSO'
_DBUS_PATH_QUERIES = _DBUS_PATH_CALLS + '/Queries'
diff --git a/framework/subsystems/opimd/pimd_contacts.py b/framework/subsystems/opimd/pimd_contacts.py
index 30fbc1c..cd5aa9c 100644
--- a/framework/subsystems/opimd/pimd_contacts.py
+++ b/framework/subsystems/opimd/pimd_contacts.py
@@ -4,6 +4,8 @@ Open PIM Daemon
(C) 2008 by Soeren Apel <abraxa at dar-clan.de>
(C) 2008 Openmoko, Inc.
+(C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2009 Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
GPLv2 or later
Contacts Domain Plugin
@@ -37,7 +39,6 @@ _MIN_MATCH_TRESHOLD = 0.69
_DBUS_PATH_CONTACTS = DBUS_PATH_BASE_FSO + '/' + _DOMAIN_NAME
_DIN_CONTACTS_BASE = DIN_BASE_FSO
-ENV_MODE = 'FSO'
_DBUS_PATH_QUERIES = _DBUS_PATH_CONTACTS + '/Queries'
diff --git a/framework/subsystems/opimd/pimd_messages.py b/framework/subsystems/opimd/pimd_messages.py
index f4ce2c3..0f570d4 100644
--- a/framework/subsystems/opimd/pimd_messages.py
+++ b/framework/subsystems/opimd/pimd_messages.py
@@ -5,6 +5,8 @@ Open PIM Daemon
(C) 2008 by Soeren Apel <abraxa at dar-clan.de>
(C) 2008 Openmoko, Inc.
+(C) 2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2009 Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
GPLv2 or later
Messages Domain Plugin
@@ -38,7 +40,6 @@ _MIN_MATCH_TRESHOLD = 0.75
_DBUS_PATH_MESSAGES = DBUS_PATH_BASE_FSO + '/' + _DOMAIN_NAME
_DIN_MESSAGES_BASE = DIN_BASE_FSO
-ENV_MODE = 'FSO'
_DBUS_PATH_QUERIES = _DBUS_PATH_MESSAGES + '/Queries'
_DBUS_PATH_FOLDERS = _DBUS_PATH_MESSAGES + '/Folders'
--
FSO frameworkd Debian packaging
More information about the pkg-fso-commits
mailing list