[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Martin Jansa]

The following commit has been merged in the debian branch:
commit 6eb3f9387c22356215b6fb5938627b0dd49d41dc
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Jan 17 13:27:37 2011 +0100

    frameworkd.conf: add eten-m800 config from OE repo

diff --git a/etc/a780/frameworkd.conf b/etc/a780/frameworkd.conf
index 1b1bf44..f48cacb 100644
--- a/etc/a780/frameworkd.conf
+++ b/etc/a780/frameworkd.conf
@@ -1,8 +1,21 @@
 [frameworkd]
+# indicates this configuration version, do not change
 version = 1
-log_level = DEBUG
+# the default log_level, if not specified per subsystem or module
+# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
+log_level = INFO
+# the global log_destination. Uncomment to enable
+# available destinations are: stderr, file, syslog
 log_to = file
+# if logging to a file, specify the destination
 log_destination = /var/log/frameworkd.log
+# persistence format, one of "pickle", "yaml"
+persist_format = pickle
+rootdir = ../etc/freesmartphone:/etc/freesmartphone:/usr/etc/freesmartphone
+# specify how subsystems scan for their plugins,
+# either "auto" (via filesystem scan) or "config" (via config section check)
+# the default is "auto" (slow).
+scantype = auto
 
 [input]
 # keys (copied from Openmoko, need to adjust)
diff --git a/etc/htcdream/frameworkd.conf b/etc/eten-m800/frameworkd.conf
similarity index 64%
copy from etc/htcdream/frameworkd.conf
copy to etc/eten-m800/frameworkd.conf
index 8c20508..50a26d0 100644
--- a/etc/htcdream/frameworkd.conf
+++ b/etc/eten-m800/frameworkd.conf
@@ -17,50 +17,29 @@ rootdir = ../etc/freesmartphone:/etc/freesmartphone:/usr/etc/freesmartphone
 # the default is "auto" (slow).
 scantype = auto
 
-[odeviced]
+[odeviced.kernel26]
 disable = 1
 
 [ogsmd]
 disable = 1
+# specify your modemtype here
 
 [ogpsd]
-device = MSMDevice
+device = EtenDevice
 channel = SerialChannel
-path = /dev/smd27
+path = /dev/ttySAC2
+
+[ogpsd.serialchannel]
+baudrate = 57600
 
 [opreferencesd]
 rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
 
-[opreferencesd.opreferenced]
-
 [oeventsd]
 rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
 
-[oeventsd.oeventsd]
-
 [opimd]
-contacts_default_backend = SQLite-Contacts
-messages_default_backend = SQLite-Messages
-calls_default_backend = SQLite-Calls
-dates_default_backend = SQLite-Dates
-notes_default_backend = SQLite-Notes
-tasks_default_backend = SQLite-Tasks
-messages_default_folder = Unfiled
-messages_trash_folder = Trash
-sim_messages_default_folder = SMS
-contacts_merging_enabled = 1
-rootdir = ../etc/freesmartphone/opim:/etc/freesmartphone/opim:/usr/etc/freesmartphone/opim
-
-[opimd.opimd]
-
-[ousaged]
 disable = 1
 
-[ophoned]
-disable = 1
-
-[otimed]
-disable = 1
-
-[onetworkd]
+[ousaged]
 disable = 1

-- 
FSO frameworkd Debian packaging