[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 184efefe69ac7625ee1f406e402d442490594d2b
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Jan 17 13:40:18 2011 +0100

    setup.py: install new yaml configs and don't install ogsmd config file by default
    
    * machine specific rules.yaml and frameworkd.conf are not installed by setup.py (ie OE recipe can choose which one to install)
    * ogsmd files can also be installed by recipe if needed (ogsmd is used on target device)

diff --git a/setup.py b/setup.py
index eaf70ab..0d46686 100644
--- a/setup.py
+++ b/setup.py
@@ -32,15 +32,14 @@ setup(
         ("../../etc/freesmartphone/opreferences/conf/profiles/",  ["etc/freesmartphone/opreferences/conf/profiles/default.yaml"]),
         ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/default.yaml"]),
         ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/silent.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/vibrate.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/phone",      ["etc/freesmartphone/opreferences/conf/phone/ring.yaml"]),
         ("../../etc/freesmartphone/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/default.yaml"]),
         ("../../etc/freesmartphone/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/silent.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/vibrate.yaml"]),
+        ("../../etc/freesmartphone/opreferences/conf/rules",      ["etc/freesmartphone/opreferences/conf/rules/ring.yaml"]),
         ("../../etc/freesmartphone/oevents",                      ["etc/freesmartphone/oevents/rules.yaml"]),
         ("../../etc/freesmartphone/persist",                      ["etc/freesmartphone/persist/README"]),
-        ("../../etc/freesmartphone/ogsmd", [
-            "etc/freesmartphone/ogsmd/cell.db",
-            "etc/freesmartphone/ogsmd/la.db",
-            "etc/freesmartphone/ogsmd/networks.tab",
-        ]),
         ("freesmartphone/examples/", getDir( "examples" ) ),
     ]
 )

-- 
FSO frameworkd Debian packaging