author | kergoth <kergoth> | 2003-08-09 17:07:39 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:07:39 (UTC) |
commit | beba0e73306815337bf04dee39502233595e9739 (patch) (side-by-side diff) | |
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 @@ -6,3 +6,2 @@ Maintainer: Dan Williams <wiliamsdr@acm.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, libopie1 @@ -10 +9,2 @@ Description: Appearance settings dialog For the Opie environment. +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 @@ -6,3 +6,2 @@ Maintainer: Warwick Allison <warwick@trolltech.com> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal @@ -10 +9,2 @@ Description: Language settings dialog For the Opie environment. +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 @@ -6,3 +6,2 @@ Maintainer: Holger Freyther <zecke@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION.1 Depends: task-opie-minimal @@ -11 +10,2 @@ Description: Configure app for the medium mounter Configure app for the medium mounter +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 @@ -7,3 +7,2 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, ntpdate, libopie1 @@ -11 +10,2 @@ Description: ntp (Network Time Protocol) gui This utility syncs system time with a atomic timerserver via internet +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 @@ -6,3 +6,2 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal @@ -10 +9,2 @@ Description: Network settings. Replaces: opie-networksetup +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,3 +1,3 @@ Package: opie-networksettingsplugin-kppp -Files: plugins/networksettings/libkppp.so* +Files: plugins/networksettings/libkppp.so* root/etc/ppp/peers/* Priority: optional @@ -6,3 +6,2 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: opie-networksettings @@ -10 +9,2 @@ Description: Network settings kppp plugin. +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 @@ -6,3 +6,2 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: opie-networksettings @@ -10 +9,2 @@ Description: Network settings wavelan plugin. +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 @@ -7,6 +7,6 @@ Architecture: arm Arch: iPAQ -Version: $QPE_VERSION-$SUB_VERSION Conflicts: opie-sound Depends: task-opie-minimal -Description: Settings for voice memos +Description: Sound settings dialog For the Opie environment. +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 @@ -6,4 +6,4 @@ Maintainer: David Woodhouse <dwmw2@infradead.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass Description: Utility for managing ssh-agent keys. +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 @@ -4,3 +4,2 @@ Priority: optional Section: opie/settings -Version: $QPE_VERSION-$SUB_VERSION-1.2 Depends: task-opie-minimal @@ -11 +10,2 @@ Description: Tab Manager Edit applications name, exec, comment and icon. Add/remove applications. +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 @@ -4,3 +4,2 @@ Priority: optional Section: opie/settings -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal @@ -10 +9,2 @@ License: GPL Description: User/Group manager for Opie. +Version: $QPE_VERSION$EXTRAVERSION |