| author | mickeyl <mickeyl> | 2003-09-20 13:40:42 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-09-20 13:40:42 (UTC) |
| commit | acc378572323b79993eb535a9d596ad1fbc8ff9f (patch) (unidiff) | |
| tree | a657cdc6a93b8234db864ad52bba190a7177fdcc /noncore/multimedia | |
| parent | af02302ec3615007e34cedfb8d91dd3a55832fbb (diff) | |
| download | opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.zip opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.tar.gz opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.tar.bz2 | |
merge control files with BRANCH
4 files changed, 6 insertions, 6 deletions
diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control index 8634cf1..6dacb36 100644 --- a/noncore/multimedia/camera/opie-camera.control +++ b/noncore/multimedia/camera/opie-camera.control | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | Package: opie-camera | 1 | Package: opie-camera |
| 2 | Files: lib/libopiecam.* bin/opiecam bin/capture pics/camera apps/Applications/camera.desktop | 2 | Files: plugins/application/libopiecam.so* lib/libopiecam.* bin/opiecam bin/capture pics/camera apps/Applications/camera.desktop |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: opie/applications | 4 | Section: opie/applications |
| 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> | 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> |
| 6 | Architecture: arm | 6 | Architecture: arm |
| 7 | Version: 1.0.1-$SUB_VERSION | 7 | Version: 1.0.1-$SUB_VERSION |
| 8 | Depends: task-opie-minimal, libopie2 (1.8.1) | 8 | Depends: task-opie-minimal, libopie2 (1.8.1) |
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control index 10c5d19..8e68c57 100644 --- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control +++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | Package: opie-mediaplayer2 | 1 | Package: opie-mediaplayer2 |
| 2 | Files: bin/opieplayer2 apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png pics/opieplayer2/down.png pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png pics/opieplayer2/up.png pics/opieplayer2/videofile.png | 2 | Files: plugins/application/libopieplayer2.so* bin/opieplayer2 apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png pics/opieplayer2/down.png pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png pics/opieplayer2/up.png pics/opieplayer2/videofile.png |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: opie/applications | 4 | Section: opie/applications |
| 5 | Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org> | 5 | Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org> |
| 6 | Architecture: arm | 6 | Architecture: arm |
| 7 | Depends: task-opie-minimal, libopie1, zlib1g, libstdc++2.10-glibc2.2, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer2-codecs | 7 | Depends: task-opie-minimal, libopie1, zlib1g, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer2-codecs |
| 8 | Description: The Opie media player | 8 | Description: The Opie media player II |
| 9 | The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and | 9 | The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and |
| 10 | more. Also it is streaming capable. | 10 | more. Also it is streaming capable. |
| 11 | Version: $QPE_VERSION$EXTRAVERSION | 11 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control index a1a2b7e..f5270e0 100644 --- a/noncore/multimedia/opierec/opierec.control +++ b/noncore/multimedia/opierec/opierec.control | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | Package: opierec | 1 | Package: opierec |
| 2 | Files: bin/opierec pics/opierec apps/Applications/opierec.desktop | 2 | Files: plugins/application/libopierec.so* bin/opierec pics/opierec apps/Applications/opierec.desktop |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: multimedia/applications | 4 | Section: multimedia/applications |
| 5 | Maintainer: L.J. Potter <ljp@llornkcor.com> | 5 | Maintainer: L.J. Potter <ljp@llornkcor.com> |
| 6 | Architecture: arm | 6 | Architecture: arm |
| 7 | Depends: opie ($QPE_VERSION) | 7 | Depends: opie ($QPE_VERSION) |
| 8 | Description: audio sampling recorder | 8 | Description: audio sampling recorder |
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control index c543335..97b7fb7 100644 --- a/noncore/multimedia/showimg/opie-showimg.control +++ b/noncore/multimedia/showimg/opie-showimg.control | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | Package: opie-showimg | 1 | Package: opie-showimg |
| 2 | Files: bin/showimg apps/Applications/showimg.desktop pics/imageviewer | 2 | Files: plugins/application/libshowimg.so* bin/showimg apps/Applications/showimg.desktop pics/imageviewer |
| 3 | Priority: optional | 3 | Priority: optional |
| 4 | Section: opie/applications | 4 | Section: opie/applications |
| 5 | Maintainer: Warwick Allison <warwick@trolltech.com> | 5 | Maintainer: Warwick Allison <warwick@trolltech.com> |
| 6 | Architecture: arm | 6 | Architecture: arm |
| 7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
| 8 | Description: Image Viewer | 8 | Description: Image Viewer |