diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-12 17:12:05 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-12 17:12:05 +0000 |
| commit | d0e9d51dbd5fc3bf911861a3349a13b84aa7b97a (patch) | |
| tree | f4b7c6d53bcd0cf97ac275ac59102d201949e8f4 /packages | |
| parent | 70211bf9611becd78daefde81ce10aa226aecc45 (diff) | |
| parent | 4f2ab4a21f451bace3a029be94419489b17cf15d (diff) | |
merge of '362f3d6a8fb4eb2bc44fac0cae3ce447a01f8a51'
and '75595250bb078a7e100758af5cacaf37e3c03572'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1-core.inc (renamed from packages/opie-mediaplayer1/opie-mediaplayer1.inc) | 4 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb | 6 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb (renamed from packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb) | 0 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb | 7 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb | 14 |
5 files changed, 16 insertions, 15 deletions
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1.inc b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc index 7c20be565b..de9ea19368 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1.inc +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc @@ -1,11 +1,9 @@ -DESCRIPTION = "The classic Opie media player" +DESCRIPTION = "The classic Opie media player (core)" SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libqtaux2" RDEPENDS = "opie-mediaplayer2-skin-default" -RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ -opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" APPNAME = "opieplayer" APPTYPE = "binary" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb new file mode 100644 index 0000000000..ca0beacb47 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb @@ -0,0 +1,6 @@ +require ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb index 16d71b2333..16d71b2333 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb deleted file mode 100644 index 5f1f6b041f..0000000000 --- a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "OPIE Mediaplayer1 OGG+MP3 pseudo package." -LICENSE = "GPL" -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" -PACKAGE_ARCH = "all" -RDEPENDS = "opie-mediaplayer1 opie-mediaplayer1-libtremorplugin opie-mediaplayer1-libmadplugin" -PR = "r1" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb index ca0beacb47..0ceaac41e4 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -1,6 +1,10 @@ -require ${PN}.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" +DESCRIPTION = "The classic Opie media player (core+plugins)." +LICENSE = "GPL" +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" +PACKAGE_ARCH = "all" +RDEPENDS = "opie-mediaplayer1-core" +RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ +opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" +PR = "r2" |