author | kergoth <kergoth> | 2003-08-09 17:07:39 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:07:39 (UTC) |
commit | beba0e73306815337bf04dee39502233595e9739 (patch) (unidiff) | |
tree | 6f876fbd953bf3c159c3bd39903409f35c1d0d87 /noncore/settings | |
parent | 04a5f51273a9120797bcdcf375ab154d3c0f8ac1 (diff) | |
download | opie-beba0e73306815337bf04dee39502233595e9739.zip opie-beba0e73306815337bf04dee39502233595e9739.tar.gz opie-beba0e73306815337bf04dee39502233595e9739.tar.bz2 |
Merge from BRANCH_1_0.
11 files changed, 13 insertions, 13 deletions
diff --git a/noncore/settings/appearance2/opie-appearance.control b/noncore/settings/appearance2/opie-appearance.control index 43705e1..2b08c76 100644 --- a/noncore/settings/appearance2/opie-appearance.control +++ b/noncore/settings/appearance2/opie-appearance.control | |||
@@ -5,6 +5,6 @@ Section: opie/settings | |||
5 | Maintainer: Dan Williams <wiliamsdr@acm.org> | 5 | Maintainer: Dan Williams <wiliamsdr@acm.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, libopie1 | 7 | Depends: task-opie-minimal, libopie1 |
9 | Description: Appearance settings dialog | 8 | Description: Appearance settings dialog |
10 | For the Opie environment. | 9 | For the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/language/opie-language.control b/noncore/settings/language/opie-language.control index 2f166b9..f4040aa 100644 --- a/noncore/settings/language/opie-language.control +++ b/noncore/settings/language/opie-language.control | |||
@@ -5,6 +5,6 @@ Section: opie/settings | |||
5 | Maintainer: Warwick Allison <warwick@trolltech.com> | 5 | Maintainer: Warwick Allison <warwick@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Language settings dialog | 8 | Description: Language settings dialog |
10 | For the Opie environment. | 9 | For the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/mediummount/opie-mediummount.control b/noncore/settings/mediummount/opie-mediummount.control index 295fba4..637095f 100644 --- a/noncore/settings/mediummount/opie-mediummount.control +++ b/noncore/settings/mediummount/opie-mediummount.control | |||
@@ -5,7 +5,7 @@ Section: opie/settings | |||
5 | Maintainer: Holger Freyther <zecke@handhelds.org> | 5 | Maintainer: Holger Freyther <zecke@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION.1 | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | License: GPL | 8 | License: GPL |
10 | Description: Configure app for the medium mounter | 9 | Description: Configure app for the medium mounter |
11 | Configure app for the medium mounter | 10 | Configure app for the medium mounter |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/netsystemtime/opie-systemtime.control b/noncore/settings/netsystemtime/opie-systemtime.control index a1f69e4..ced9333 100644 --- a/noncore/settings/netsystemtime/opie-systemtime.control +++ b/noncore/settings/netsystemtime/opie-systemtime.control | |||
@@ -6,6 +6,6 @@ Provides: opie-netsystemtime | |||
6 | Maintainer: Patrick S. Vogt <tille@handhelds.org> | 6 | Maintainer: Patrick S. Vogt <tille@handhelds.org> |
7 | Architecture: arm | 7 | Architecture: arm |
8 | Version: $QPE_VERSION-$SUB_VERSION | ||
9 | Depends: task-opie-minimal, ntpdate, libopie1 | 8 | Depends: task-opie-minimal, ntpdate, libopie1 |
10 | Description: ntp (Network Time Protocol) gui | 9 | Description: ntp (Network Time Protocol) gui |
11 | This utility syncs system time with a atomic timerserver via internet | 10 | This utility syncs system time with a atomic timerserver via internet |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control index 62bf6f2..124d1e6 100644 --- a/noncore/settings/networksettings/opie-networksettings.control +++ b/noncore/settings/networksettings/opie-networksettings.control | |||
@@ -5,6 +5,6 @@ Section: opie/settings | |||
5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> | 5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Network settings. | 8 | Description: Network settings. |
10 | Replaces: opie-networksetup | 9 | Replaces: opie-networksetup |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/networksettings/ppp/opie-networksettingsplugin-kppp.control b/noncore/settings/networksettings/ppp/opie-networksettingsplugin-kppp.control index c68ae33..94b1d3f 100644 --- a/noncore/settings/networksettings/ppp/opie-networksettingsplugin-kppp.control +++ b/noncore/settings/networksettings/ppp/opie-networksettingsplugin-kppp.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-networksettingsplugin-kppp | 1 | Package: opie-networksettingsplugin-kppp |
2 | Files: plugins/networksettings/libkppp.so* | 2 | Files: plugins/networksettings/libkppp.so* root/etc/ppp/peers/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> | 5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: opie-networksettings | 7 | Depends: opie-networksettings |
9 | Description: Network settings kppp plugin. | 8 | Description: Network settings kppp plugin. |
10 | 9 | ||
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control index 703aea5..719337f 100644 --- a/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control +++ b/noncore/settings/networksettings/wlan/opie-networksettingsplugin-wlan.control | |||
@@ -5,6 +5,6 @@ Section: opie/settings | |||
5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> | 5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: opie-networksettings | 7 | Depends: opie-networksettings |
9 | Description: Network settings wavelan plugin. | 8 | Description: Network settings wavelan plugin. |
10 | 9 | ||
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control index 895ef44..d7589d3 100644 --- a/noncore/settings/sound/opie-vmemo-settings.control +++ b/noncore/settings/sound/opie-vmemo-settings.control | |||
@@ -6,7 +6,7 @@ Maintainer: L.J. Potter | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Arch: iPAQ | 7 | Arch: iPAQ |
8 | Version: $QPE_VERSION-$SUB_VERSION | ||
9 | Conflicts: opie-sound | 8 | Conflicts: opie-sound |
10 | Depends: task-opie-minimal | 9 | Depends: task-opie-minimal |
11 | Description: Settings for voice memos | 10 | Description: Sound settings dialog |
12 | For the Opie environment. | 11 | For the Opie environment. |
12 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control index ec7afbc..44c58b6 100644 --- a/noncore/settings/sshkeys/opie-sshkeys.control +++ b/noncore/settings/sshkeys/opie-sshkeys.control | |||
@@ -5,5 +5,5 @@ Section: opie/settings | |||
5 | Maintainer: David Woodhouse <dwmw2@infradead.org> | 5 | Maintainer: David Woodhouse <dwmw2@infradead.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass | 7 | Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass |
9 | Description: Utility for managing ssh-agent keys. | 8 | Description: Utility for managing ssh-agent keys. |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/tabmanager/opie-tabmanager.control b/noncore/settings/tabmanager/opie-tabmanager.control index 65b4702..f064f12 100644 --- a/noncore/settings/tabmanager/opie-tabmanager.control +++ b/noncore/settings/tabmanager/opie-tabmanager.control | |||
@@ -3,5 +3,4 @@ Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanage | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Version: $QPE_VERSION-$SUB_VERSION-1.2 | ||
6 | Depends: task-opie-minimal | 5 | Depends: task-opie-minimal |
7 | Architecture: arm | 6 | Architecture: arm |
@@ -10,2 +9,3 @@ Description: Tab Manager | |||
10 | Create new tabs, remove old tabs. Edit tab's name, comment and icon. | 9 | Create new tabs, remove old tabs. Edit tab's name, comment and icon. |
11 | Edit applications name, exec, comment and icon. Add/remove applications. | 10 | Edit applications name, exec, comment and icon. Add/remove applications. |
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/settings/usermanager/opie-usermanager.control b/noncore/settings/usermanager/opie-usermanager.control index 9948dab..90367e6 100644 --- a/noncore/settings/usermanager/opie-usermanager.control +++ b/noncore/settings/usermanager/opie-usermanager.control | |||
@@ -3,5 +3,4 @@ Files: bin/usermanager apps/Settings/usermanager.desktop pics/usermanager/* | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Version: $QPE_VERSION-$SUB_VERSION | ||
6 | Depends: task-opie-minimal | 5 | Depends: task-opie-minimal |
7 | Architecture: arm | 6 | Architecture: arm |
@@ -9,2 +8,3 @@ Maintainer: Ted Parnefors <zaurus@bredband.net> | |||
9 | License: GPL | 8 | License: GPL |
10 | Description: User/Group manager for Opie. | 9 | Description: User/Group manager for Opie. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||