merge of '49d6fb299ea52b27b881053a089d50fa688a1582'

     and '89bcc665b5e831cc60b3aaef92e938c69ba33870'

6 files changed, 12 insertions, 11 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b853f779ed..5fa9ed7e38 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -136,8 +136,8 @@ SRCREV_pn-opkg ?= "4142"
 SRCREV_pn-opkg-native ?= "4142"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pyneod ?= "86"
-SRCREV_pn-pyneog ?= "85"
+SRCREV_pn-pyneod ?= "88"
+SRCREV_pn-pyneog ?= "88"
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "127"
 SRCREV_pn-python-lightmediascanner = "68"
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 02957aebe9..d4da2c16d4 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = " \
   file://asoundrc \
@@ -28,6 +28,7 @@ SRC_URI_append_fic-gta01 = " \
 
 SRC_URI_append_fic-gta02 = "\
   file://stereoout.state \
+  file://gsmhandset.state \
   "
 
 inherit update-rc.d
diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/fic-gta02/asound.state
index 7a8405a16e..04e6f60da9 100644
--- a/packages/alsa/alsa-state/fic-gta02/asound.state
+++ b/packages/alsa/alsa-state/fic-gta02/asound.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 235
+		value.1 235
 	}
 	control.2 {
 		comment.access 'read write'
diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
index 348b109d8d..cc0d32a7c7 100644
--- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
+++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 235
+		value.1 235
 	}
 	control.2 {
 		comment.access 'read write'
diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/fic-gta02/stereoout.state
index 7a8405a16e..04e6f60da9 100644
--- a/packages/alsa/alsa-state/fic-gta02/stereoout.state
+++ b/packages/alsa/alsa-state/fic-gta02/stereoout.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 235
+		value.1 235
 	}
 	control.2 {
 		comment.access 'read write'
diff --git a/packages/freesmartphone/pyneog_svn.bb b/packages/freesmartphone/pyneog_svn.bb
index b640426497..389c7369e5 100644
--- a/packages/freesmartphone/pyneog_svn.bb
+++ b/packages/freesmartphone/pyneog_svn.bb
@@ -15,12 +15,12 @@ do_compile() {
 do_install() {
 	find . -name ".svn"|xargs rm -rf
 	install -d ${D}${datadir}/pyneog
-	for i in media *.py Xsession.d.zadje; do
+	for i in media *.py; do
 		cp -a $i ${D}${datadir}/pyneog/
 	done
 
 	install -d ${D}${sysconfdir}/X11/Xsession.d/
-	ln -sf ${datadir}/pyneog/Xsession.d.zadje ${D}${sysconfdir}/X11/Xsession.d/80zadje
+	install -m 0755 80pyneog ${D}${sysconfdir}/X11/Xsession.d/
 }
 
 FILES_${PN} = "${datadir} ${bindir} ${sysconfdir}"