[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 1b88e26fede2386b5c52e25329adb251b61c6cf6
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Jan 28 00:47:47 2009 +0100

    opimd: move csv-contacts to where it belongs. adjust setup.py accordingly to install it.

diff --git a/ChangeLog b/ChangeLog
index bc94b08..7329399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-28	Michael Lauer	<mlauer at vanille-media.de>
+
+	* [opimd]: Fixed dbus objects not appearing since they were registered on the initial dbus connection,
+	the subsystems use individual connections though.
+
 2009-01-23	Michael Lauer	<mlauer at vanille-media.de>
 	
 	* [odeviced]: powercontrol_neo: Use bind/unbind way of controlling ar6k power to get the maximum
diff --git a/framework/subsystems/opimd/csv-contacts.txt b/etc/freesmartphone/opim/csv-contacts.txt
similarity index 100%
rename from framework/subsystems/opimd/csv-contacts.txt
rename to etc/freesmartphone/opim/csv-contacts.txt
diff --git a/setup.py b/setup.py
index 710c02d..0ebd710 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,7 @@ setup(
         ("../../etc/freesmartphone/oevents",                      ["etc/freesmartphone/oevents/rules.yaml"]),
         ("../../etc/freesmartphone/persist",                      ["etc/freesmartphone/persist/README"]),
         ("../../etc/freesmartphone/ogsmd",                        ["etc/freesmartphone/ogsmd/networks.tab"]),
+        ("../../etc/freesmartphone/opim",                         ["etc/freesmartphone/opim/csv-contacts.txt"]),
         ("freesmartphone/examples/", getDir( "examples" ) ),
     ]
 )

-- 
FSO frameworkd Debian packaging