diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-09-03 19:22:53 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-09-03 19:22:53 +0000 |
| commit | cdafdc4da4ca1c891d593d2839e024484b0c2468 (patch) | |
| tree | fdebee622257cd9ee847f7714492e0817c2d0953 /packages | |
| parent | 819cd56f786f99f645ce43e9882dcc7546c9ff4d (diff) | |
| parent | eccbdc9395f7b525e77087d13d5ae66f2932098f (diff) | |
merge of '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'
and 'ca29e1912671c0d9322d55bfb15de7d18a7379d6'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/freesmartphone/frameworkd_git.bb | 2 | ||||
| -rw-r--r-- | packages/freesmartphone/fso-sounds.bb | 8 | ||||
| -rw-r--r-- | packages/python/python-2.5-manifest.inc | 4 | ||||
| -rw-r--r-- | packages/python/python_2.5.2.bb | 2 |
4 files changed, 10 insertions, 6 deletions
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" |