[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 a2aa9f85aa01e71c54074d444cded6044e3a45a6
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Jan 17 13:33:50 2011 +0100

    opreferences: merge config with frameworkd-config-shr

diff --git a/etc/freesmartphone/opreferences/conf/phone/default.yaml b/etc/freesmartphone/opreferences/conf/phone/default.yaml
index b98dfca..e02e6cf 100644
--- a/etc/freesmartphone/opreferences/conf/phone/default.yaml
+++ b/etc/freesmartphone/opreferences/conf/phone/default.yaml
@@ -1,6 +1,8 @@
-ring-tone: "female_ringtone.wav"
-ring-volume: 10
-
+message-loop: true
 message-tone: "female_message.wav"
 message-volume: 10
-
+message-vibration: true
+ring-loop: true
+ring-tone: "female_ringtone.wav"
+ring-volume: 10
+ring-vibration: true
diff --git a/etc/freesmartphone/opreferences/conf/phone/ring.yaml b/etc/freesmartphone/opreferences/conf/phone/ring.yaml
new file mode 100644
index 0000000..0770fd9
--- /dev/null
+++ b/etc/freesmartphone/opreferences/conf/phone/ring.yaml
@@ -0,0 +1,8 @@
+message-loop: true
+message-tone: "female_message.wav"
+message-volume: 10
+message-vibration: false
+ring-loop: true
+ring-tone: "female_ringtone.wav"
+ring-volume: 10
+ring-vibration: false
diff --git a/etc/freesmartphone/opreferences/conf/phone/silent.yaml b/etc/freesmartphone/opreferences/conf/phone/silent.yaml
index 5951fcb..4b1e6af 100644
--- a/etc/freesmartphone/opreferences/conf/phone/silent.yaml
+++ b/etc/freesmartphone/opreferences/conf/phone/silent.yaml
@@ -1,3 +1,4 @@
-
-ring-volume: 0
 message-volume: 0
+message-vibration: false
+ring-volume: 0
+ring-vibration: false
diff --git a/etc/freesmartphone/opreferences/conf/phone/vibrate.yaml b/etc/freesmartphone/opreferences/conf/phone/vibrate.yaml
new file mode 100644
index 0000000..8385572
--- /dev/null
+++ b/etc/freesmartphone/opreferences/conf/phone/vibrate.yaml
@@ -0,0 +1,4 @@
+message-volume: 0
+message-vibration: true
+ring-volume: 0
+ring-vibration: true
diff --git a/etc/freesmartphone/opreferences/conf/profiles/default.yaml b/etc/freesmartphone/opreferences/conf/profiles/default.yaml
index 19113ce..11a1328 100644
--- a/etc/freesmartphone/opreferences/conf/profiles/default.yaml
+++ b/etc/freesmartphone/opreferences/conf/profiles/default.yaml
@@ -1,3 +1,5 @@
 profiles:
   - default
+  - ring
+  - vibrate
   - silent
diff --git a/etc/freesmartphone/opreferences/conf/rules/silent.yaml b/etc/freesmartphone/opreferences/conf/rules/ring.yaml
similarity index 100%
copy from etc/freesmartphone/opreferences/conf/rules/silent.yaml
copy to etc/freesmartphone/opreferences/conf/rules/ring.yaml
diff --git a/etc/freesmartphone/opreferences/conf/rules/silent.yaml b/etc/freesmartphone/opreferences/conf/rules/vibrate.yaml
similarity index 100%
copy from etc/freesmartphone/opreferences/conf/rules/silent.yaml
copy to etc/freesmartphone/opreferences/conf/rules/vibrate.yaml

-- 
FSO frameworkd Debian packaging