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/pim | |
parent | af02302ec3615007e34cedfb8d91dd3a55832fbb (diff) | |
download | opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.zip opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.tar.gz opie-acc378572323b79993eb535a9d596ad1fbc8ff9f.tar.bz2 |
merge control files with BRANCH
-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 |
5 files changed, 8 insertions, 9 deletions
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,5 +1,5 @@ | |||
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 |
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,9 +1,9 @@ | |||
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 |
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,5 +1,5 @@ | |||
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> |
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,5 +1,5 @@ | |||
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> |