Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/02 15:16:21+02:00 uni-frankfurt.de!mickeyl
unbreak ramdisk script on collie (once again)

2004/10/02 01:57:16+02:00 uni-frankfurt.de!mickeyl
opie-mediaplayer2 catch up with upstream cleanups

BKrev: 415eaa37xIZOJ8ixZUaXWO4YEqLEdg

diff --git a/initscripts/initscripts-1.0/ramdisk b/initscripts/initscripts-1.0/ramdisk
index fc04e33..192c212 100644 (file)
--- a/initscripts/initscripts-1.0/ramdisk
+++ b/initscripts/initscripts-1.0/ramdisk
@@ -35,7 +35,7 @@ if (test ! -e /etc/.configured) || test "$OLD_MTD_SIZE" != "$RAM_MTD_SIZE"; then
   dd if=/dev/zero bs=1024 count=$RAM_MTD_SIZE of=$RAM_MTD 2>/dev/null >&2 || exit 1
   test "$VERBOSE" != "no" && echo "$RAM_MTD";
   test "$VERBOSE" != "no" && echo -n "Creating filesystem on ramdisk: "
-  mkfs -t $FSTYPE $RAM_MTDBLK 2>/dev/null >&2 || exit 1
+  mkfs.$FSTYPE $RAM_MTDBLK 2>/dev/null >&2 || exit 1
   test "$VERBOSE" != "no" && echo "$RAM_MTDBLK";
 fi
 

diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index 9c74eef..9183388 100644 (file)
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -4,7 +4,7 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "file://halt \
            file://ramdisk \

diff --git a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
index c560fd4..58eb9f2 100644 (file)
--- a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
@@ -1,13 +1,14 @@
-DESCRIPTION = "The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and more. Also it is streaming capable."
+DESCRIPTION = "The next generation mediaplayer for Opie - based libxine. \
+It plays mp3, mpeg, wav, ogg, quicktime, divx, etc. and is capable of streaming."
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>
 PV = "1.1.6-cvs-${CVSDATE}"
-DEPENDS = "libxine"
+DEPENDS = "libxine-1.0.0-rc6a"
 RDEPENDS = "opie-mediaplayer2-skin"
 APPNAME = "opieplayer2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/opieplayer2 \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
@@ -20,8 +21,6 @@ inherit opie
 QMAKE_PROFILES = "opieplayer2.pro"
 
 do_install() {
-       install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/apps/Applications
+       install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/apps/Applications/mediaplayer.desktop ${D}${palmtopdir}/apps/Applications/
 }
-