merge of '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'

     and 'ca29e1912671c0d9322d55bfb15de7d18a7379d6'

6 files changed, 13 insertions, 8 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7b561fcc39..f97df53af2 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,6 +43,7 @@ SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe"
+SRCREV_pn-fso-sounds ?= "fcadedec08294c5eebd176483695828959a76e0b"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index ee1b6753e3..2560853982 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -289,8 +289,8 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-resource", "Python Resource Control Interface", "python-core",
     "lib-dynload/resource.so" )
 
-    m.addPackage( 0, "python-shell", "Python Shell-Like Functionality", "python-core python-re",
-    "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" )
+    m.addPackage( 1, "python-shell", "Python Shell-Like Functionality", "python-core python-re",
+    "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" )
 
     m.addPackage( 0, "python-robotparser", "Python robots.txt parser", "python-core python-netclient",
     "robotparser.*")
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 52bd54a4f1..0532166748 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.2+gitr${SRCREV}"
-PR = "r3"
+PR = "r0"
 
 inherit distutils update-rc.d
 
diff --git a/packages/freesmartphone/fso-sounds.bb b/packages/freesmartphone/fso-sounds.bb
index 9c42ada539..5ee60e19d6 100644
--- a/packages/freesmartphone/fso-sounds.bb
+++ b/packages/freesmartphone/fso-sounds.bb
@@ -1,14 +1,18 @@
 DESCRIPTION = "A set of notification sounds"
 LICENSE = "PD"
 SECTION = "multimedia"
-PV = "0.0.0"
+PV = "0.0.1+gitr${SRCREV}"
 PR = "r0"
 
-SRC_URI = "http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid"
+SRC_URI = "\
+  http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid \
+  ${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master \
+"
 
 do_install() {
 	install -d ${D}${datadir}/sounds/
 	install ${WORKDIR}/*.sid ${D}${datadir}/sounds/
+	install ${WORKDIR}/git/sounds/*.mp3 ${D}${datadir}/sounds/
 }
 
 FILES_${PN} = "${datadir}"
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 9ae307e7a4..68fb934e54 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -264,9 +264,9 @@ RDEPENDS_python-debugger="python-core python-io python-lang python-re python-str
 FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* "
 
 DESCRIPTION_python-shell="Python Shell-Like Functionality"
-PR_python-shell="ml0"
+PR_python-shell="ml1"
 RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* "
+FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shlex.* ${libdir}/python2.5/shutil.* "
 
 DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
 PR_python-bsddb="ml1"
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index c68f7d5e3b..e285575149 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 # bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml9"
+PR = "ml10"
 
 PYTHON_MAJMIN = "2.5"