[pkg-fso-commits] [SCM] openmoko-files-config, various files for the Openmoko devices branch, master, updated. debian/20091114-2-g9af7243
Sebastian Reichel
sre at ring0.de
Wed Feb 3 09:14:38 UTC 2010
The following commit has been merged in the master branch:
commit 9af72430ec0819afe9ba7d2114a12cf7ca9e9d96
Author: Sebastian Reichel <sre at ring0.de>
Date: Wed Feb 3 10:14:30 2010 +0100
update
diff --git a/GTA01_Neo-1973/etc/frameworkd.conf b/GTA01_Neo-1973/etc/frameworkd.conf
index ec81e99..c977943 100644
--- a/GTA01_Neo-1973/etc/frameworkd.conf
+++ b/GTA01_Neo-1973/etc/frameworkd.conf
@@ -5,7 +5,7 @@ version = 1
# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
log_level = WARNING
# the global log_destination. Uncomment to enable
-log_to = stderr
+log_to = file
#log_to = file
#log_to = syslog
# if logging to a file, specify the destination
diff --git a/GTA02_Neo-FreeRunner/etc/frameworkd.conf b/GTA02_Neo-FreeRunner/etc/frameworkd.conf
index f23de0d..1818f7c 100644
--- a/GTA02_Neo-FreeRunner/etc/frameworkd.conf
+++ b/GTA02_Neo-FreeRunner/etc/frameworkd.conf
@@ -5,7 +5,7 @@ version = 1
# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL
log_level = WARNING
# the global log_destination. Uncomment to enable
-log_to = stderr
+log_to = file
#log_to = file
#log_to = syslog
# if logging to a file, specify the destination
diff --git a/GTA02_Neo-FreeRunner/usr/share/openmoko/scenarios/gsmhandset.state b/GTA02_Neo-FreeRunner/usr/share/openmoko/scenarios/gsmhandset.state
index c27e8e0..ce4f3f6 100644
--- a/GTA02_Neo-FreeRunner/usr/share/openmoko/scenarios/gsmhandset.state
+++ b/GTA02_Neo-FreeRunner/usr/share/openmoko/scenarios/gsmhandset.state
@@ -608,7 +608,7 @@ state.neo1973gta02 {
comment.item.3 'Right PGA'
iface MIXER
name 'Mic Sidetone Mux'
- value 'Mic 2'
+ value 'Right PGA'
}
control.64 {
comment.access 'read write'
diff --git a/General/etc/frameworkd.conf b/General/etc/frameworkd.conf
index 3bbcdb9..5cb7e5b 100644
--- a/General/etc/frameworkd.conf
+++ b/General/etc/frameworkd.conf
@@ -6,7 +6,7 @@ version = 1
log_level = INFO
# the global log_destination. Uncomment to enable
# available destinations are: stderr, file, syslog
-log_to = stderr
+log_to = file
# if logging to a file, specify the destination
log_destination = /tmp/frameworkd.log
# persistence format, one of "pickle", "yaml"
diff --git a/common/etc/udev/rules.d/55-openmoko-gta01-gta02.rules b/common/lib/udev/rules.d/55-openmoko-gta01-gta02.rules
similarity index 100%
rename from common/etc/udev/rules.d/55-openmoko-gta01-gta02.rules
rename to common/lib/udev/rules.d/55-openmoko-gta01-gta02.rules
diff --git a/debian/changelog b/debian/changelog
index a5c5582..ec0d02f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openmoko-files-config (20100203) unstable; urgency=low
+
+ * Update GTA02 gsmhandset.state to improve remote sound
+ * Update Standards Version to 3.8.4
+
+ -- Sebastian Reichel <elektranox at gmail.com> Wed, 03 Feb 2010 09:48:32 +0100
+
openmoko-files-config (20100117) unstable; urgency=low
* update udev rule
diff --git a/debian/control b/debian/control
index 6739ddb..71ced33 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian freesmartphone.org Team <pkg-fso-maint at lists.alioth.debian.or
Uploaders: Luca Capello <luca at pca.it>, Joachim Breitner <nomeata at debian.org>, Sebastian Reichel <elektranox at gmail.com>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://freesmartphone.org/
Vcs-Git: git://git.debian.org/git/pkg-fso/openmoko-files-config.git
Vcs-Browser: http://git.debian.org/?p=pkg-fso/openmoko-files-config.git;a=summary
@@ -22,7 +22,7 @@ Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
Replaces: fso-config
Provides: fso-config
Description: configuration files for Openmoko GTA01 Neo 1973
- This packages provides the various files needed by the Openmoko GTA01
+ This package provides the various files needed by the Openmoko GTA01
Neo 1973 mobile phone: udev rules, frameworkd configuration,
touchscreen calibration and audio scenario files.
.
@@ -41,7 +41,7 @@ Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
Replaces: fso-config
Provides: fso-config
Description: configuration files for Openmoko GTA02 Neo FreeRunner
- This packages provides the various files needed by the Openmoko GTA02
+ This package provides the various files needed by the Openmoko GTA02
Neo FreeRunner mobile phone: udev rules, frameworkd configuration,
touchscreen calibration and audio scenario files.
.
@@ -57,8 +57,21 @@ Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
Replaces: fso-config
Provides: fso-config
Description: general configuration files for the freesmartphone.org frameworkd
- This packages provides the freesmartphone.org frameworkd configuration
+ This package provides the freesmartphone.org frameworkd configuration
files. It also depends on the default fso-sounds package.
.
This package is part of the freesmartphone.org software stack
and it is targeted for smartphones.
+
+Package: fso-sounds-none
+Architecture: all
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: fso-frameworkd
+Provides: fso-sounds
+Description: void ringtone for the freesmartphone.org frameworkd
+ This package configures the freesmartphone.org frameworkd for no
+ ringtones.
+ .
+ This package is part of the freesmartphone.org software stack and
+ it is targeted for smartphones.
diff --git a/debian/fso-sounds-none.README.Debian b/debian/fso-sounds-none.README.Debian
new file mode 100644
index 0000000..842c2c3
--- /dev/null
+++ b/debian/fso-sounds-none.README.Debian
@@ -0,0 +1,9 @@
+fso-sounds-* packages for Debian
+--------------------------------
+
+Please refer to /usr/share/doc/fso-frameworkd/README.Debian, section
+"fso-sounds virtual package", if you want to use the ringtones
+provided by this package with the freesmartphone.org frameworkd.
+
+ -- Luca Capello <luca at pca.it>, Wed, 13 May 2009 16:02:06 +0200
+
diff --git a/debian/fso-sounds-none.install b/debian/fso-sounds-none.install
new file mode 100644
index 0000000..3147eca
--- /dev/null
+++ b/debian/fso-sounds-none.install
@@ -0,0 +1 @@
+fso-sounds-none/* /
diff --git a/debian/fso-sounds-none.postinst b/debian/fso-sounds-none.postinst
new file mode 100644
index 0000000..443cad3
--- /dev/null
+++ b/debian/fso-sounds-none.postinst
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+# Register the phone file with update-alternatives.
+if [ "$1" = "configure" ]; then
+ update-alternatives \
+ --install \
+ /etc/freesmartphone/opreferences/conf/phone/default.yaml \
+ fso-frameworkd-default-sounds.yaml \
+ /usr/share/fso-sounds-rules/none.yaml \
+ 20
+fi
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
diff --git a/debian/fso-sounds-none.prerm b/debian/fso-sounds-none.prerm
new file mode 100644
index 0000000..73fdb82
--- /dev/null
+++ b/debian/fso-sounds-none.prerm
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+# Remove the phone file from update-alternatives.
+if [ "$1" = "remove" ]; then
+ update-alternatives \
+ --remove \
+ fso-frameworkd-default-sounds.yaml \
+ /usr/share/fso-sounds-rules/none.yaml
+fi
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
diff --git a/fso-sounds-none/usr/share/fso-sounds-rules/none.yaml b/fso-sounds-none/usr/share/fso-sounds-rules/none.yaml
new file mode 100644
index 0000000..abf6a70
--- /dev/null
+++ b/fso-sounds-none/usr/share/fso-sounds-rules/none.yaml
@@ -0,0 +1,7 @@
+# Debian ring- and message-tones configuration: no sounds
+
+ring-tone: ""
+ring-volume: 0
+
+message-tone: ""
+message-volume: 0
--
openmoko-files-config, various files for the Openmoko devices
More information about the pkg-fso-commits
mailing list