From beba0e73306815337bf04dee39502233595e9739 Mon Sep 17 00:00:00 2001 From: kergoth Date: Sat, 09 Aug 2003 17:07:39 +0000 Subject: Merge from BRANCH_1_0. --- (limited to 'core') diff --git a/core/applets/batteryapplet/opie-batteryapplet.control b/core/applets/batteryapplet/opie-batteryapplet.control index 94dc464..0bf5507 100644 --- a/core/applets/batteryapplet/opie-batteryapplet.control +++ b/core/applets/batteryapplet/opie-batteryapplet.control @@ -4,8 +4,8 @@ Priority: optional Section: opie/taskbar Maintainer: Opie team Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Conflicts: opie-batteryapplet-ipaq Description: Battery Monitor applet Battery Monitor applet for the Opie environment taskbar. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control index 02e1f2f..954faac 100644 --- a/core/applets/cardmon/opie-cardmon.control +++ b/core/applets/cardmon/opie-cardmon.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/taskbar Maintainer: Maximilian Reiß Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, libopie1 Description: CF/PCMCIA Card Monitor applet SD/MMC/CF/PCMCIA Card Monitor applet for the Opie environment taskbar. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/clipboardapplet/opie-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control index 63a7709..3768f3f 100644 --- a/core/applets/clipboardapplet/opie-clipboardapplet.control +++ b/core/applets/clipboardapplet/opie-clipboardapplet.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/taskbar Maintainer: Robert Griebl Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Clipboard applet Clipboard applet for the Opie environment taskbar. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control index 93841f7..9587882 100644 --- a/core/applets/clockapplet/opie-clockapplet.control +++ b/core/applets/clockapplet/opie-clockapplet.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/taskbar Maintainer: Warwick Allison Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Clock applet Clock applet for the Opie environment taskbar. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control index 41ae925..f3bfe81 100644 --- a/core/applets/irdaapplet/opie-irdaapplet.control +++ b/core/applets/irdaapplet/opie-irdaapplet.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: David Woodhouse Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION.1 Depends: task-opie-minimal, libopieobex1 Description: Irda Applet An IrDA taskbar applet for the Opie environment +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control index 2928846..12040a8 100644 --- a/core/applets/restartapplet2/opie-restartapplet2.control +++ b/core/applets/restartapplet2/opie-restartapplet2.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: L. J. Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION.1 Depends: task-opie-minimal Description: Restart Applet A simple opie menu applet to restart the Opie environment +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/screenshotapplet/opie-screenshotapplet.control b/core/applets/screenshotapplet/opie-screenshotapplet.control index 50f6046..8f160a7 100644 --- a/core/applets/screenshotapplet/opie-screenshotapplet.control +++ b/core/applets/screenshotapplet/opie-screenshotapplet.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: L. J. Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Screenshot Applet A screenshot taskbar applet for the Opie environment +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/vmemo/opie-vmemo.control b/core/applets/vmemo/opie-vmemo.control index 58f8798..55a45d7 100644 --- a/core/applets/vmemo/opie-vmemo.control +++ b/core/applets/vmemo/opie-vmemo.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: L.J. Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, opie-vmemo-settings Description: Voice Memo Recorder Applet The voice memo recorder for the Opie environment +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/volumeapplet/opie-volumeapplet.control b/core/applets/volumeapplet/opie-volumeapplet.control index 78ae4c6..99b1808 100644 --- a/core/applets/volumeapplet/opie-volumeapplet.control +++ b/core/applets/volumeapplet/opie-volumeapplet.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/taskbar Maintainer: L.J. Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION.1 Depends: task-opie-minimal Description: Volume applet Volume applet for the Opie environment taskbar. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control index 1999e81..b72c1fc 100644 --- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control +++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: L.J. Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, libopie1, opie-keytabs Description: KDE's konsole (shell terminal) Ported to the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control index 15eff8a..4312979 100644 --- a/core/apps/helpbrowser/opie-helpbrowser.control +++ b/core/apps/helpbrowser/opie-helpbrowser.control @@ -5,7 +5,7 @@ Section: opie/applications Maintainer: Warwick Allison Architecture: arm Arch: iPAQ -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Browse HTML help documents The HTML help browser for the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/apps/qcop/opie-qcop.control b/core/apps/qcop/opie-qcop.control index 43779da..56463aa 100644 --- a/core/apps/qcop/opie-qcop.control +++ b/core/apps/qcop/opie-qcop.control @@ -4,7 +4,7 @@ Priority: required Section: opie/system Maintainer: Martin Jones Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: libqte2 Description: Interprocess communication client Interprocess communication client for the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control index 0d86274..5ec205b 100644 --- a/core/apps/textedit/opie-textedit.control +++ b/core/apps/textedit/opie-textedit.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: L. J. Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, libopie1 Description: Text Editor The text editor for the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control index fe5f4e0..f6dcfc2 100644 --- a/core/launcher/opie-taskbar.control +++ b/core/launcher/opie-taskbar.control @@ -4,7 +4,7 @@ Priority: required Section: opie/system Maintainer: Project Opie Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION.3 Depends: task-opie-minimal Replaces: opie-rotation Description: Launcher for Opie +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control index ccd93bd..15c083f 100644 --- a/core/multimedia/opieplayer/libmad/opie-libmadplugin.control +++ b/core/multimedia/opieplayer/libmad/opie-libmadplugin.control @@ -1,11 +1,11 @@ -Package: opieplayer1-libmadplugin +Package: opie-libmadplugin Files: plugins/codecs/libmadplugin.so.1.0.0 plugins/codecs/libmadplugin.so.1.0 plugins/codecs/libmadplugin.so.1 plugins/codecs/libmadplugin.so Priority: optional Section: opie/plugins Maintainer: Maximilian Reiss Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: MP3 file plugin using libmad Plugin to play MP3 files with the mediaplayer in the Opie environment. It also hast streaming support (Shoutcast/Icecast). +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control index 76adea2..4d690eb 100644 --- a/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control +++ b/core/multimedia/opieplayer/libmpeg3/opie-libmpeg3plugin.control @@ -1,10 +1,10 @@ -Package: opieplayer1-libmpeg3plugin +Package: opie-libmpeg3plugin Files: plugins/codecs/libmpeg3plugin.so.1.0.0 plugins/codecs/libmpeg3plugin.so.1.0 plugins/codecs/libmpeg3plugin.so.1 plugins/codecs/libmpeg3plugin.so Priority: optional Section: opie/plugins Maintainer: L.J.Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Mpeg video file plugin using libmad Plugin to play MPeg3 video files with the mediaplayer in the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control index e8fe893..dba0d7b 100644 --- a/core/multimedia/opieplayer/modplug/opie-modplugin.control +++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control @@ -1,4 +1,4 @@ -Package: opieplayer1-modplugin +Package: opie-modplugin Files: plugins/codecs/libmodplugin.so* Priority: optional Section: opie/plugins diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control index eb2d157..97e9f88 100644 --- a/core/multimedia/opieplayer/opie-mediaplayer.control +++ b/core/multimedia/opieplayer/opie-mediaplayer.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: L.J.Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, libopie1, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape Description: The Opie media player The mediaplayer for Opie. It plays mp3, mpeg, and wav. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control index d47904f..ab834d1 100644 --- a/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control +++ b/core/multimedia/opieplayer/vorbis/opie-libtremorplugin.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/plugins Maintainer: L.J. Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, libtremor Description: Ogg file plugin using tremor Plugin to play ogg files with the mediaplayer in the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control index 9defddc..3a0b3b8 100644 --- a/core/multimedia/opieplayer/vorbis/tremor/libtremor.control +++ b/core/multimedia/opieplayer/vorbis/tremor/libtremor.control @@ -1,10 +1,10 @@ Package: libtremor -Files: root/usr/lib/libtremor.so root/usr/lib/libtremor.so.1 root/usr/lib/libtremor.so.1.0 root/usr/lib/libtremor.so.1.0.0 +Files: lib/libtremor.so lib/libtremor.so.1 lib/libtremor.so.1.0 lib/libtremor.so.1.0.0 Priority: optional Section: opie/plugins Maintainer: Lorn Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: vorbis (tremor) library Library needed for playing OGG files with the mediaplayer in the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control index f5fa641..a59c35b 100644 --- a/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control +++ b/core/multimedia/opieplayer/wavplugin/opie-wavplugin.control @@ -1,10 +1,10 @@ -Package: opieplayer1-wavplugin +Package: opie-wavplugin Files: plugins/codecs/libwavplugin* Priority: optional Section: opie/plugins Maintainer: Lorn Potter Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: WAV file plugin Plugin to play WAV files with the mediaplayer in the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/obex/libopieobex0.control b/core/obex/libopieobex0.control index 778c411..d43aa89 100644 --- a/core/obex/libopieobex0.control +++ b/core/obex/libopieobex0.control @@ -4,9 +4,9 @@ Priority: optional Section: opie/system Maintainer: holger Freyther Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION.1 Depends: task-opie-minimal ($QPE_VERSION), openobex | libopenobex1 Provides: libopieobex1 Replaces: libopieobex1 Description: Irda obex lib +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control index d28c67e..4d2ebf4 100644 --- a/core/opie-login/opie-login.control +++ b/core/opie-login/opie-login.control @@ -1,10 +1,10 @@ Package: opie-login -Files: bin/opie-login share/opie-login/opie-session share/opie-login/pre-session share/opie-login/post-session +Files: bin/opie-login share/opie-login/opie-session share/opie-login/pre-session share/opie-login/post-session root/opt/QtPalmtop/etc/opie-login.conf Priority: optional Section: opie/system Maintainer: Project Opie Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION -Depends: opie-common, libqpe1, libopie1 +Depends: task-opie-minimal, libopie1, opie-security Description: Multiuser login for OPIE A xdm/kdm equivalent for OPIE. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control index e2e90a8..dca6c96 100644 --- a/core/opiealarm/opie-opiealarm.control +++ b/core/opiealarm/opie-opiealarm.control @@ -6,8 +6,8 @@ Conflicts: ipaqalarm, atd Section: opie/system Maintainer: Robert Griebl Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Description: A wakeup system for OPIE events. Tiny, OPIE specific replacement for ipaqalarm, uschedule and qpe2uschedule +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control index 54e2cda..ef209de 100644 --- a/core/pim/osearch/opie-osearch.control +++ b/core/pim/osearch/opie-osearch.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/ Maintainer: Patrick S. Vogt Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: search... +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index a057faa..70f7738 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: Maximilian Reiß Architecture: arm -Version: 0.6.2-$SUB_VERSION +Version: $QPE_VERSION$EXTRAVERSION Depends: task-opie-minimal, libopie1 License: GPL Description: today screen diff --git a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control index 231f4d0..e07d770 100644 --- a/core/pim/today/plugins/datebook/opie-today-datebookplugin.control +++ b/core/pim/today/plugins/datebook/opie-today-datebookplugin.control @@ -4,6 +4,6 @@ Priority: optional Section: opie/applications Maintainer: Maximilian Reiss Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: libqte2, opie-today Description: Datebook plugin for today +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control index e6944b5..0f05e47 100644 --- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control +++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control @@ -4,6 +4,6 @@ Priority: optional Section: opie/applications Maintainer: Maximilian Reiss Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: libqte2, opie-today Description: Todolist plugin for today +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control index d28e1f8..b4bddbf 100644 --- a/core/pim/today/task-opie-today.control +++ b/core/pim/today/task-opie-today.control @@ -4,7 +4,7 @@ Section: opie/applications Maintainer: Maximilian Reiß Architecture: arm Version: 0.5-$SUB_VERSION -Depends: task-opie-minimal, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin, opie-today-mailplugin +Depends: task-opie-minimal, libopie1, opie-today, opie-today-datebookplugin, opie-today-todolistplugin License: GPL Description: Task for basic today setup includes datebook, todolist and mail plugin diff --git a/core/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control index fcc10e7..34dc7e0 100644 --- a/core/settings/button/opie-button-settings.control +++ b/core/settings/button/opie-button-settings.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Robert Griebl Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Device-buttons settings dialog For the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control index ce26e34..5b0c8da 100644 --- a/core/settings/citytime/opie-citytime.control +++ b/core/settings/citytime/opie-citytime.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Maximilian Reiss Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal, timezones Description: Time-zone / world clock settings The time-zone manager for the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control index 21a5559..0e7832d 100644 --- a/core/settings/launcher/opie-launcher-settings.control +++ b/core/settings/launcher/opie-launcher-settings.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Robert Griebl Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Launcher settings dialog For the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION 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 89a5b2f..da6fc4f 100644 --- a/core/settings/light-and-power/opie-light-and-power.control +++ b/core/settings/light-and-power/opie-light-and-power.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Maximilian Reiss Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Light and Power settings dialog For the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control index 84b001d..0da6f0f 100644 --- a/core/settings/security/opie-security.control +++ b/core/settings/security/opie-security.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Warwick Allison Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Description: Security settings dialog For the Opie environment. +Version: $QPE_VERSION$EXTRAVERSION -- cgit v0.9.0.2