45 files changed, 73 insertions, 49 deletions
@@ -12,6 +12,10 @@ ifneq ($(CONFIG_THREADED),) else echo CONFIG -= thread >> $@ endif +# added for auto stripped build +ifneq ($(CONFIG_STRIP),) + echo CONFIG += strip >> $@ +endif ifneq ($(CONFIG_DEBUG),) echo CONFIG += debug >> $@ echo CONFIG -= release >> $@ @@ -107,6 +111,10 @@ ifeq ($(CONFIG_LIBXINE_DEP),y) echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ endif +ifeq ($(CONFIG_LIBBLUEZ_DEP),y) + echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@ + echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@ +endif ifeq ($(CONFIG_LIBIPK_DEP),y) echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control index 9e0957b..6e9ad7c 100644 --- a/core/multimedia/opieplayer/modplug/opie-modplugin.control +++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control @@ -4,7 +4,7 @@ Priority: optional Section: libs Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 2.0.2-$EXTRAVERSION Depends: task-opie-minimal Description: MOD/XM/S3M/IT plugin using libmodplug Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment. diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 0654e1a..3f0ac74 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -67,7 +67,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, m_config.load(); setCaption( tr("Contacts") ); - setIcon( Resource::loadPixmap( "AddressBook" ) ); + setIcon( Resource::loadPixmap( "addressbook/AddressBook" ) ); // Settings for Main Menu // setToolBarsMovable( false ); diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control index 6798141..3d637cc 100644 --- a/core/pim/today/task-opie-today.control +++ b/core/pim/today/task-opie-today.control @@ -3,7 +3,7 @@ Priority: optional Section: opie/pim Maintainer: Maximilian Reiß <harlekin@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.5$EXTRAVERSION Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin License: GPL Description: Task for basic Today app setup diff --git a/core/settings/security/demo/multiauth.control b/core/settings/security/demo/multiauth.control index c7dd82a..c549035 100644 --- a/core/settings/security/demo/multiauth.control +++ b/core/settings/security/demo/multiauth.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Clement Seveillac <clement@nist.gov> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.0.2$EXTRAVERSION Depends: opie-security Description: multi-plugin authentication demonstrator for Opie. This demonstration application allows us to use one or several diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp index fbed5a1..59dd17e 100644 --- a/core/tools/quicklauncher/main.cpp +++ b/core/tools/quicklauncher/main.cpp @@ -117,8 +117,7 @@ public: appName = appName.mid( sep+1 ); appIface = 0; - if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) != QS_OK ) { - owarn << "Plugin does not support QuickLauncher interface" << oendl; + if ( ! ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) ) { exit(-1); } diff --git a/dependencies.in b/dependencies.in index ce1ac96..357d994 100644 --- a/dependencies.in +++ b/dependencies.in @@ -82,3 +82,15 @@ string "libsword include dir" depends LIBSWORD_DEP + config LIBBLUEZ_DEP + boolean "Have bluez library" + default "n" + + config LIBBLUEZ_LIB_DIR + string "libbluez library dir" + depends LIBBLUEZ_DEP + + config LIBBLUEZ_INC_DIR + string "libbluez include dir" + depends LIBBLUEZ_DEP + diff --git a/etc/opie-keytabs.control b/etc/opie-keytabs.control index e3d83de..9563b3a 100644 --- a/etc/opie-keytabs.control +++ b/etc/opie-keytabs.control @@ -4,6 +4,6 @@ Priority: optional Section: opie/applications Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.6$EXTRAVERSION License: GPL Description: Opie keytabs for terminal applications diff --git a/libopie2/libopie2.control b/libopie2/libopie2.control index fcd44b4..e72c535 100644 --- a/libopie2/libopie2.control +++ b/libopie2/libopie2.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.2$EXTRAVERSION Depends: libopiecore2 ($QPE_VERSION), libopiedb2 ($QPE_VERSION), libopiemm2 ($QPE_VERSION), libopienet2 ($QPE_VERSION), libopiepim2 ($QPE_VERSION), libopieui2 ($QPE_VERSION) Provides: libopie2 Description: Opie library 2.0 diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control index c7fc141..1d27c1c 100644 --- a/libopie2/opiecore/libopiecore2.control +++ b/libopie2/opiecore/libopiecore2.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.5$EXTRAVERSION Depends: libqpe1 Provides: libopiecore2 Description: Opie library 2.0 CORE diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control index 7e9354a..5744b24 100644 --- a/libopie2/opiedb/libopiedb2.control +++ b/libopie2/opiedb/libopiedb2.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.2$EXTRAVERSION Depends: libqpe1, libopiecore2 ($QPE_VERSION), libsqlite3-0 | sqlite3-bin Provides: libopiedb2 Description: Opie library 2.1 DB diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control index 0dd2df2..38d7ddc 100644 --- a/libopie2/opiemm/libopiemm2.control +++ b/libopie2/opiemm/libopiemm2.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.2$EXTRAVERSION Depends: libqpe1, libopiecore2 (1.8.2) Provides: libopiemm2 Description: Opie library 2.0 MM diff --git a/libopie2/opienet/libopienet2.control b/libopie2/opienet/libopienet2.control index 69876b5..da53e2b 100644 --- a/libopie2/opienet/libopienet2.control +++ b/libopie2/opienet/libopienet2.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/libs Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.4$EXTRAVERSION Depends: libopiecore2, libpcap0.8 (>=0.7.2) Provides: libopienet2 Description: Opie library 2.0 NET diff --git a/libopie2/opiepim/libopiepim2.control b/libopie2/opiepim/libopiepim2.control index 28b7505..457e20a 100644 --- a/libopie2/opiepim/libopiepim2.control +++ b/libopie2/opiepim/libopiepim2.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.3$EXTRAVERSION Depends: libqpe1, libopiecore2 (>=1.8.0) Provides: libopiepim2 Description: Opie library 2.0 PIM diff --git a/libopie2/opiesecurity/libopiesecurity2.control b/libopie2/opiesecurity/libopiesecurity2.control index 1eabb93..0a29a47 100644 --- a/libopie2/opiesecurity/libopiesecurity2.control +++ b/libopie2/opiesecurity/libopiesecurity2.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.5$EXTRAVERSION Depends: libqpe1, libopiecore2, libopieui2 Provides: libopiesecurity2 Recommends: opie-multiauth-pinplugin | opie-multiauth-noticeplugin | opie-multiauth-dummyplugin | opie-multiauth-bluepingplugin, opie-security diff --git a/libopie2/opieui/oresource.cpp b/libopie2/opieui/oresource.cpp index 9559210..c94421a 100644 --- a/libopie2/opieui/oresource.cpp +++ b/libopie2/opieui/oresource.cpp @@ -42,6 +42,7 @@ QPixmap loadPixmap( const QString& pix ) { QString filename; filename.sprintf( "%s/%s.png", (const char*) oApp->qpeDir(), (const char*) pix ); + odebug << "Load pixmap " << filename << oendl; QPixmap pixmap( filename ); if ( pixmap.isNull() ) { diff --git a/libqtaux/libqtaux.control b/libqtaux/libqtaux.control index d801a98..996962f 100644 --- a/libqtaux/libqtaux.control +++ b/libqtaux/libqtaux.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 2.3.7$EXTRAVERSION Depends: libqte2 Provides: libqtaux Description: Qt/Embedded Auxilliary Stuff diff --git a/noncore/applets/zkbapplet/zkbapplet.control b/noncore/applets/zkbapplet/zkbapplet.control index 08b540f..4e03c26 100644 --- a/noncore/applets/zkbapplet/zkbapplet.control +++ b/noncore/applets/zkbapplet/zkbapplet.control @@ -7,4 +7,4 @@ Architecture: arm Depends: task-opie-minimal Description: ZKB Applet and configuration program Obsoletes: keyz-cfg -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.6.0$EXTRAVERSION diff --git a/noncore/apps/dagger/opie-dagger.control b/noncore/apps/dagger/opie-dagger.control index cfb45be..4ded1f2 100644 --- a/noncore/apps/dagger/opie-dagger.control +++ b/noncore/apps/dagger/opie-dagger.control @@ -6,4 +6,4 @@ Depends: task-opie-minimal, libopiecore2, libopieui2 Architecture: arm Maintainer: Dan Williams (drw@handhelds.org) Description: A Bible study program utilizing the Sword library. -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.9.1$EXTRAVERSION diff --git a/noncore/games/bounce/opie-bounce.control b/noncore/games/bounce/opie-bounce.control index 0513958..54c14b4 100644 --- a/noncore/games/bounce/opie-bounce.control +++ b/noncore/games/bounce/opie-bounce.control @@ -1,6 +1,6 @@ Package: opie-bounce Files: plugins/application/libbounce.so* bin/bounce apps/Games/bounce.desktop pics/bounce/*.png -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.6$EXTRAVERSION Depends: task-opie-minimal, libopiecore2 Priority: optional Section: opie/games diff --git a/noncore/games/buzzword/opie-buzzword.control b/noncore/games/buzzword/opie-buzzword.control index f76a2c2..586b566 100644 --- a/noncore/games/buzzword/opie-buzzword.control +++ b/noncore/games/buzzword/opie-buzzword.control @@ -1,6 +1,6 @@ Package: opie-buzzword Files: plugins/application/libbuzzword.so* bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.1$EXTRAVERSION Depends: task-opie-minimal,libopiecore2 Priority: optional Section: opie/games diff --git a/noncore/games/kbill/opie-kbill.control b/noncore/games/kbill/opie-kbill.control index cf12bca..665fa32 100644 --- a/noncore/games/kbill/opie-kbill.control +++ b/noncore/games/kbill/opie-kbill.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/games Maintainer: Mark Westcott <mark@houseoffish.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.8$EXTRAVERSION Depends: task-opie-minimal License: GPL Description: The famous hit Bill game diff --git a/noncore/games/kcheckers/opie-kcheckers.control b/noncore/games/kcheckers/opie-kcheckers.control index e7c20d3..e64acca 100644 --- a/noncore/games/kcheckers/opie-kcheckers.control +++ b/noncore/games/kcheckers/opie-kcheckers.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/games Maintainer: leseb <prudhomme@laposte.net> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.3$EXTRAVERSION Depends: task-opie-minimal, libopiecore2 Description: The game of Checkers A game for the Opie environment. diff --git a/noncore/games/kpacman/opie-kpacman.control b/noncore/games/kpacman/opie-kpacman.control index 97120aa..2717f44 100644 --- a/noncore/games/kpacman/opie-kpacman.control +++ b/noncore/games/kpacman/opie-kpacman.control @@ -1,6 +1,6 @@ Package: opie-kpacman Files: plugins/applications/libkpacman.so* bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.3.1$EXTRAVERSION Depends: task-opie-minimal Priority: optional Section: opie/games diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control index 5171050..091de98 100644 --- a/noncore/multimedia/camera/opie-camera.control +++ b/noncore/multimedia/camera/opie-camera.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/multimedia Maintainer: Michael 'Mickey' Lauer <mickeyl@Vanille.de> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.0.1$EXTRAVERSION Depends: libqpe1, libopiecore2, libopieui2 Description: A Camera Application A Camera Application to use with the Sharp CE-AG06. diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control index f4cbc41..9c14ab4 100644 --- a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control +++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control @@ -3,7 +3,7 @@ Files: root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbi Section: ;ibs Essential: no Priority: optional -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.7$EXTRAVERSION Architecture: arm Maintainer: Maximilian Reiss <harlekin@handhelds.org> Depends: libc6 (>= 2.1), opie-mediaplayer2 diff --git a/noncore/multimedia/powerchord/opie-powerchord.control b/noncore/multimedia/powerchord/opie-powerchord.control index 490e8a2..5216385 100644 --- a/noncore/multimedia/powerchord/opie-powerchord.control +++ b/noncore/multimedia/powerchord/opie-powerchord.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/multimedia Maintainer: Camilo Mesias <camilo@mesias.co.uk>, ljp <lpotter@trolltech.com> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.0.8$EXTRAVERSION Depends: task-opie-minimal Description: Guitar Chord generator application Allows naming of chords using base note and key. Fretboard diagrams are diff --git a/noncore/net/mail/libetpanstuff/libetpan.control b/noncore/net/mail/libetpanstuff/libetpan.control index b664157..d90124d 100644 --- a/noncore/net/mail/libetpanstuff/libetpan.control +++ b/noncore/net/mail/libetpanstuff/libetpan.control @@ -4,7 +4,7 @@ Priority: optional Section: system Maintainer: Rajko Albrecht <alwin@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.33$EXTRAVERSION Depends: libssl0.9.7 Description: libetpan mail/news library - A version of libetpan patched for Opies mailing app License: LGPL diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.control b/noncore/net/mail/libmailwrapper/libmailwrapper.control index 3491d67..1226c10 100644 --- a/noncore/net/mail/libmailwrapper/libmailwrapper.control +++ b/noncore/net/mail/libmailwrapper/libmailwrapper.control @@ -4,7 +4,7 @@ Priority: optional Section: libs Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.6$EXTRAVERSION Depends: task-opie-minimal, libopiecore2, libopieui2, libetpan (>= 0.33pre) Description: wrapper lib needed by Opie's mailer License: LGPL diff --git a/noncore/net/mail/taskbarapplet/opie-mailapplet.control b/noncore/net/mail/taskbarapplet/opie-mailapplet.control index c838e0b..fc7b337 100644 --- a/noncore/net/mail/taskbarapplet/opie-mailapplet.control +++ b/noncore/net/mail/taskbarapplet/opie-mailapplet.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applets Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.5$EXTRAVERSION Depends: task-opie-minimal, libopiecore2, opie-mail Description: A Biff-like mailchecker License: LGPL diff --git a/noncore/net/opierdesktop/opie-rdesktop.control b/noncore/net/opierdesktop/opie-rdesktop.control index 2a9d415..754e572 100644 --- a/noncore/net/opierdesktop/opie-rdesktop.control +++ b/noncore/net/opierdesktop/opie-rdesktop.control @@ -4,6 +4,6 @@ Priority: optional Section: opie/applications Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.2.0$EXTRAVERSION Depends: task-opie-minimal Description: Remote Desktop Protocol (RDP) Client diff --git a/noncore/net/opietooth/blue-pin/opie-bluepin.control b/noncore/net/opietooth/blue-pin/opie-bluepin.control index e9aa683..3d94691 100644 --- a/noncore/net/opietooth/blue-pin/opie-bluepin.control +++ b/noncore/net/opietooth/blue-pin/opie-bluepin.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: Holger Freyther <zecke@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.3.4$EXTRAVERSION Depends: task-opie-minimal License: GPL Description: Bluetooth pin application diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control index 89ab698..5a4d01d 100644 --- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control +++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Maximilian Reiß <max.reiss@gmx.de> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.5.4$EXTRAVERSION Depends: task-opie-minimal, libopietooth1, opie-bluepin License: GPL Description: Bluetooth Manager application diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control index 7dc9c22..2c36d17 100644 --- a/noncore/net/wellenreiter/opie-wellenreiter.control +++ b/noncore/net/wellenreiter/opie-wellenreiter.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.0.3$EXTRAVERSION Depends: libqpe1, libpcap0.8 (>=0.7.2), libopiecore2, libopienet2, libopieui2 Description: A WaveLAN Network Monitor A WaveLAN Network Monitor/Sniffer for the Opie Environment. diff --git a/noncore/securityplugins/blueping/bluepingplugin.control b/noncore/securityplugins/blueping/bluepingplugin.control index 62562f7..4b3e96a 100644 --- a/noncore/securityplugins/blueping/bluepingplugin.control +++ b/noncore/securityplugins/blueping/bluepingplugin.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Clement Seveillac <clement@nist.gov> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.0.2$EXTRAVERSION Depends: libopiecore2, opie-security, bluez-utils (<= 2.3rel-hh5) Description: Blueping plugin for opie-security authentication. This is a bluetooth-based authentication plugin (you need diff --git a/noncore/securityplugins/dummy/dummyplugin.control b/noncore/securityplugins/dummy/dummyplugin.control index b4cc5e2..bfd4d8d 100644 --- a/noncore/securityplugins/dummy/dummyplugin.control +++ b/noncore/securityplugins/dummy/dummyplugin.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Clement Seveillac <clement@nist.gov> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.0.2$EXTRAVERSION Depends: libopiecore2, opie-security Description: Dummy plugin for opie-security authentication. This is a very simple authentication plugin (you just have diff --git a/noncore/securityplugins/notice/notice.control b/noncore/securityplugins/notice/notice.control index 091ce74..29a8fb7 100644 --- a/noncore/securityplugins/notice/notice.control +++ b/noncore/securityplugins/notice/notice.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Clement Seveillac <clement@nist.gov> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.0.1$EXTRAVERSION Depends: libopiecore2, opie-security Description: Notice plugin for opie-security authentication. It allows you to display e.g. a notice from your legal departement. diff --git a/noncore/securityplugins/pin/pin.control b/noncore/securityplugins/pin/pin.control index 51c3f08..9235f04 100644 --- a/noncore/securityplugins/pin/pin.control +++ b/noncore/securityplugins/pin/pin.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Clement Seveillac <clement@nist.gov> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.0.2$EXTRAVERSION Depends: libopiecore2, opie-security Description: PIN plugin for opie-security authentication. Simple PIN-based authentication plugin (replicate the functionality diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control index 496a036..6627335 100644 --- a/noncore/tools/opie-sh/opie-sh.control +++ b/noncore/tools/opie-sh/opie-sh.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/sh Maintainer: Thomas Stephens <spiralman@softhome.net> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.5$EXTRAVERSION Depends: task-opie-minimal License: GPL Description: A QDialog shell frontend diff --git a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control index 0d6b235..9450eee 100644 --- a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control +++ b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control @@ -1,7 +1,7 @@ Package: opie-sh-wavelanchooser Files: bin/opie-sh-wavelanchooser.sh apps/Opie-SH/opie-sh-wavelanchooser.desktop pics/opie-sh-scripts/qtwavelan.png Installed-Size: 0 -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.1$EXTRAVERSION Depends: task-opie-minimal (1.5.0+), opie-sh Priority: optional Section: opie/sh diff --git a/noncore/unsupported/gsmtool/opie-gsmtool.control b/noncore/unsupported/gsmtool/opie-gsmtool.control index d987b11..6c5e4a3 100644 --- a/noncore/unsupported/gsmtool/opie-gsmtool.control +++ b/noncore/unsupported/gsmtool/opie-gsmtool.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: David Woodhouse <dwmw2@infradead.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.0.0$EXTRAVERSION Depends: task-opie-minimal, gsmlib License: Public Domain Description: GSMTool program diff --git a/noncore/unsupported/ubrowser/opie-ubrowser.control b/noncore/unsupported/ubrowser/opie-ubrowser.control index bfa6c30..349a7df 100644 --- a/noncore/unsupported/ubrowser/opie-ubrowser.control +++ b/noncore/unsupported/ubrowser/opie-ubrowser.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: Thomas Stephens <spiralman@softhome.net> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.1$EXTRAVERSION Depends: task-opie-minimal License: GPL Description: A very small web browser diff --git a/scripts/GeneratePackageMake b/scripts/GeneratePackageMake index 099d3e8..9d692a9 100755 --- a/scripts/GeneratePackageMake +++ b/scripts/GeneratePackageMake @@ -35,10 +35,10 @@ endef # define DoPackage -@echo \"Building ipk of \$(4)\" -@( \$(ForSubst) ) > \$(TOPDIR)/scripts/subst -@( \$(ForFileSubst) ) > \$(TOPDIR)/scripts/Filesubst -@( cd \$(OPIEDIR); \\ +echo \"Building ipk of \$(4)\" +( \$(ForSubst) ) > \$(TOPDIR)/scripts/subst +( \$(ForFileSubst) ) > \$(TOPDIR)/scripts/Filesubst +( cd \$(OPIEDIR); \\ \$(OPIEDIR)/scripts/mkipkg \\ --subst=\$(OPIEDIR)/scripts/subst \\ --filesubst=\$(OPIEDIR)/scripts/filesubst \\ diff --git a/scripts/mkipkg b/scripts/mkipkg index a336371..2f020f4 100755 --- a/scripts/mkipkg +++ b/scripts/mkipkg @@ -244,8 +244,8 @@ createFileList() stripFile() { - if [ -f $1 -a -x $1 ]; then - $strip --strip-all $1 + if [ ! -h $1 -a -f $1 -a -x $1 ]; then + $strip -p --strip-all $1 fi } @@ -276,7 +276,11 @@ substFile() stripFiles() { for f in $1; do - stripFile ./$f + # do not strip links + if [ ! -h ./$f ] + then + stripFile ./$f + fi done } diff --git a/scripts/tothreaded b/scripts/tothreaded index 31ed31e..f916ad8 100755 --- a/scripts/tothreaded +++ b/scripts/tothreaded @@ -28,10 +28,10 @@ findthreadedequiv() { if [ -z "$isin" ] then # no threaded package - echo -n "$i " + echo -n "$i" else # threaded package - echo -n "${isin}-mt " + echo -n "${isin}-mt" fi done echo |