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 /core | |
parent | af02302ec3615007e34cedfb8d91dd3a55832fbb (diff) | |
download | opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.zip opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.tar.gz opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.tar.bz2 |
merge control files with BRANCH
-rw-r--r-- | core/apps/embeddedkonsole/opie-embeddedkonsole.control | 2 | ||||
-rw-r--r-- | core/apps/helpbrowser/opie-helpbrowser.control | 2 | ||||
-rw-r--r-- | core/apps/textedit/opie-textedit.control | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/opie-mediaplayer.control | 4 | ||||
-rw-r--r-- | core/pim/addressbook/opie-addressbook.control | 2 | ||||
-rw-r--r-- | core/pim/datebook/opie-datebook.control | 4 | ||||
-rw-r--r-- | core/pim/osearch/opie-osearch.control | 7 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
-rw-r--r-- | core/pim/todo/opie-todo.control | 2 | ||||
-rw-r--r-- | core/settings/button/opie-button-settings.control | 2 | ||||
-rw-r--r-- | core/settings/citytime/opie-citytime.control | 2 | ||||
-rw-r--r-- | core/settings/launcher/opie-launcher-settings.control | 2 | ||||
-rw-r--r-- | core/settings/light-and-power/opie-light-and-power.control | 2 | ||||
-rw-r--r-- | core/settings/security/opie-security.control | 2 | ||||
-rw-r--r-- | core/tools/quicklauncher/qpe-quicklauncher.control | 4 |
15 files changed, 20 insertions, 21 deletions
diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control index b72c1fc..95d28bf 100644 --- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control +++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-embeddedkonsole | 1 | Package: opie-embeddedkonsole |
2 | Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole | 2 | Files: plugins/application/libembeddedkonsole.so* bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: L.J. Potter <ljp@llornkcor.com> | 5 | Maintainer: L.J. Potter <ljp@llornkcor.com> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control index 4312979..7729c2b 100644 --- a/core/apps/helpbrowser/opie-helpbrowser.control +++ b/core/apps/helpbrowser/opie-helpbrowser.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-helpbrowser | 1 | Package: opie-helpbrowser |
2 | Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser | 2 | Files: plugins/application/libhelpbrowser.so* bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser |
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 |
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control index 5ec205b..1e72316 100644 --- a/core/apps/textedit/opie-textedit.control +++ b/core/apps/textedit/opie-textedit.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-textedit | 1 | Package: opie-textedit |
2 | Files: bin/textedit apps/1Pim/textedit.desktop pics/textedit | 2 | Files: plugins/application/libtextedit.so* bin/textedit apps/1Pim/textedit.desktop pics/textedit |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: L. J. Potter <llornkcor@handhelds.org> | 5 | Maintainer: L. J. Potter <llornkcor@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control index 97e9f88..63c4fd7 100644 --- a/core/multimedia/opieplayer/opie-mediaplayer.control +++ b/core/multimedia/opieplayer/opie-mediaplayer.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-mediaplayer | 1 | Package: opie-mediaplayer |
2 | Files: bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop | 2 | Files: plugins/application/libopieplayer.so* bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/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: task-opie-minimal, libopie1, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape | 7 | Depends: task-opie-minimal, libopie1, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape |
8 | Description: The Opie media player | 8 | Description: The Opie media player |
9 | The mediaplayer for Opie. It plays mp3, mpeg, and wav. | 9 | The mediaplayer for Opie. It plays mp3, mpeg, mod and wav. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control index d949bd4..29740e4 100644 --- a/core/pim/addressbook/opie-addressbook.control +++ b/core/pim/addressbook/opie-addressbook.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-addressbook | 1 | Package: opie-addressbook |
2 | Files: bin/addressbook apps/1Pim/addressbook.desktop | 2 | Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Conflicts: qpe-tkcaddressbook | 5 | Conflicts: qpe-tkcaddressbook |
6 | Maintainer: Stefan Eilers <eilers.stefan@epost.de> | 6 | Maintainer: Stefan Eilers <eilers.stefan@epost.de> |
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control index fe5a086..4fe9abf 100644 --- a/core/pim/datebook/opie-datebook.control +++ b/core/pim/datebook/opie-datebook.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-datebook | 1 | Package: opie-datebook |
2 | Files: bin/datebook apps/1Pim/datebook.desktop | 2 | Files: plugins/application/libdatebook.so* bin/datebook apps/1Pim/datebook.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Conflicts: qpe-tkccalendar | 5 | Conflicts: qpe-tkccalendar |
6 | Maintainer: Warwick Allison <warwick@trolltech.com> | 6 | Maintainer: Holger 'Zecke' Freyther <zecke@handhelds.org> |
7 | Architecture: arm | 7 | Architecture: arm |
8 | Depends: task-opie-minimal, libopie1, opie-pics | 8 | Depends: task-opie-minimal, libopie1, opie-pics |
9 | Description: A datebook/appointment manager | 9 | Description: A datebook/appointment manager |
10 | A datebook/appointment manager for the Opie environment. | 10 | A datebook/appointment manager for the Opie environment. |
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control index ef209de..738a9b7 100644 --- a/core/pim/osearch/opie-osearch.control +++ b/core/pim/osearch/opie-osearch.control | |||
@@ -1,10 +1,9 @@ | |||
1 | Package: opie-osearch | 1 | Package: opie-osearch |
2 | Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png | 2 | Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/ | 4 | Section: opie/applications |
5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> | 5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
8 | Description: search... | 8 | Description: Search through all PIM data |
9 | |||
10 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index 70f7738..aab4db9 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-today | 1 | Package: opie-today |
2 | Files: bin/today apps/1Pim/today.desktop pics/today/* | 2 | Files: plugins/application/libtoday.so* bin/today apps/1Pim/today.desktop pics/today/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> | 5 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control index 17a65a8..86f9b7a 100644 --- a/core/pim/todo/opie-todo.control +++ b/core/pim/todo/opie-todo.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-todo | 1 | Package: opie-todo |
2 | Files: bin/todolist apps/1Pim/todo.desktop | 2 | Files: plugins/application/libtodolist.so* bin/todolist apps/1Pim/todo.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org> | 5 | Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control index 34dc7e0..93b084c 100644 --- a/core/settings/button/opie-button-settings.control +++ b/core/settings/button/opie-button-settings.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-button-settings | 1 | Package: opie-button-settings |
2 | Files: bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png | 2 | Files: plugins/application/libbuttonsettings.so* bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Robert Griebl <sandman@handhelds.org> | 5 | Maintainer: Robert Griebl <sandman@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control index 5b0c8da..5f3f33c 100644 --- a/core/settings/citytime/opie-citytime.control +++ b/core/settings/citytime/opie-citytime.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-citytime | 1 | Package: opie-citytime |
2 | Files: bin/citytime apps/Settings/citytime.desktop pics/citytime | 2 | Files: plugins/application/libcitytime.so* bin/citytime apps/Settings/citytime.desktop pics/citytime |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> | 5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control index 0e7832d..58596e8 100644 --- a/core/settings/launcher/opie-launcher-settings.control +++ b/core/settings/launcher/opie-launcher-settings.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-launcher-settings | 1 | Package: opie-launcher-settings |
2 | Files: bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings | 2 | Files: plugins/application/liblaunchersettings.so* bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Robert Griebl <sandman@handhelds.org> | 5 | Maintainer: Robert Griebl <sandman@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control index da6fc4f..eaa47f3 100644 --- a/core/settings/light-and-power/opie-light-and-power.control +++ b/core/settings/light-and-power/opie-light-and-power.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-light-and-power | 1 | Package: opie-light-and-power |
2 | Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower | 2 | Files: plugins/application/liblight-and-power.so* bin/light-and-power apps/Settings/Light.desktop pics/lightandpower |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> | 5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control index 0da6f0f..6059e90 100644 --- a/core/settings/security/opie-security.control +++ b/core/settings/security/opie-security.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-security | 1 | Package: opie-security |
2 | Files: bin/security apps/Settings/Security.desktop pics/security | 2 | Files: plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Warwick Allison <warwick@trolltech.com> | 5 | Maintainer: Warwick Allison <warwick@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/core/tools/quicklauncher/qpe-quicklauncher.control b/core/tools/quicklauncher/qpe-quicklauncher.control index f07a7d5..b1bab53 100644 --- a/core/tools/quicklauncher/qpe-quicklauncher.control +++ b/core/tools/quicklauncher/qpe-quicklauncher.control | |||
@@ -3,8 +3,8 @@ Priority: required | |||
3 | Section: qpe/system | 3 | Section: qpe/system |
4 | Maintainer: Trolltech (www.trolltech.com) | 4 | Maintainer: Trolltech (www.trolltech.com) |
5 | Architecture: $CPU_ARCH | 5 | Architecture: $CPU_ARCH |
6 | Arch: $DEVICE_ARCH | 6 | Arch: $DEVICE_ARCH |
7 | Version: $QPE_VERSION-12 | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Depends: qpe-libqtopia qpe-pim | 8 | Depends: |
9 | Description: Quick launcher stub | 9 | Description: Quick launcher stub |
10 | Launcher stub for quick launch enabled applications. | 10 | Launcher stub for quick launch enabled applications. |