45 files changed, 70 insertions, 46 deletions
@@ -1,30 +1,34 @@ | |||
1 | .phony: force | 1 | .phony: force |
2 | force: | 2 | force: |
3 | 3 | ||
4 | $(configs) : | 4 | $(configs) : |
5 | $(call makecfg,$@) | 5 | $(call makecfg,$@) |
6 | 6 | ||
7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config | 7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config |
8 | echo > $@ | 8 | echo > $@ |
9 | # added for threaded version | 9 | # added for threaded version |
10 | ifneq ($(CONFIG_THREADED),) | 10 | ifneq ($(CONFIG_THREADED),) |
11 | echo CONFIG += thread >> $@ | 11 | echo CONFIG += thread >> $@ |
12 | else | 12 | else |
13 | echo CONFIG -= thread >> $@ | 13 | echo CONFIG -= thread >> $@ |
14 | endif | 14 | endif |
15 | # added for auto stripped build | ||
16 | ifneq ($(CONFIG_STRIP),) | ||
17 | echo CONFIG += strip >> $@ | ||
18 | endif | ||
15 | ifneq ($(CONFIG_DEBUG),) | 19 | ifneq ($(CONFIG_DEBUG),) |
16 | echo CONFIG += debug >> $@ | 20 | echo CONFIG += debug >> $@ |
17 | echo CONFIG -= release >> $@ | 21 | echo CONFIG -= release >> $@ |
18 | echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ | 22 | echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ |
19 | echo DEFINES += QT_DEBUG >> $@ | 23 | echo DEFINES += QT_DEBUG >> $@ |
20 | else | 24 | else |
21 | echo CONFIG -= debug >> $@ | 25 | echo CONFIG -= debug >> $@ |
22 | echo CONFIG += release >> $@ | 26 | echo CONFIG += release >> $@ |
23 | echo DEFINES += "OPIE_NO_DEBUG" >> $@ | 27 | echo DEFINES += "OPIE_NO_DEBUG" >> $@ |
24 | endif | 28 | endif |
25 | ifeq ($(CONFIG_STATIC),y) | 29 | ifeq ($(CONFIG_STATIC),y) |
26 | echo !contains\( TARGET,qpe \) \{ >> $@ | 30 | echo !contains\( TARGET,qpe \) \{ >> $@ |
27 | echo CONFIG += staticlib >> $@ | 31 | echo CONFIG += staticlib >> $@ |
28 | echo \} >> $@ | 32 | echo \} >> $@ |
29 | endif | 33 | endif |
30 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 | 34 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |
@@ -94,32 +98,36 @@ endif | |||
94 | ifeq ($(CONFIG_LIBETPAN_DEP),y) | 98 | ifeq ($(CONFIG_LIBETPAN_DEP),y) |
95 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ | 99 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ |
96 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ | 100 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ |
97 | endif | 101 | endif |
98 | ifeq ($(CONFIG_LIBPCAP_DEP),y) | 102 | ifeq ($(CONFIG_LIBPCAP_DEP),y) |
99 | echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ | 103 | echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ |
100 | echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ | 104 | echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ |
101 | endif | 105 | endif |
102 | ifeq ($(CONFIG_LIBSQLITE_DEP),y) | 106 | ifeq ($(CONFIG_LIBSQLITE_DEP),y) |
103 | echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ | 107 | echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ |
104 | echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ | 108 | echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ |
105 | endif | 109 | endif |
106 | ifeq ($(CONFIG_LIBXINE_DEP),y) | 110 | ifeq ($(CONFIG_LIBXINE_DEP),y) |
107 | echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ | 111 | echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ |
108 | echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ | 112 | echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ |
109 | endif | 113 | endif |
114 | ifeq ($(CONFIG_LIBBLUEZ_DEP),y) | ||
115 | echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@ | ||
116 | echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@ | ||
117 | endif | ||
110 | ifeq ($(CONFIG_LIBIPK_DEP),y) | 118 | ifeq ($(CONFIG_LIBIPK_DEP),y) |
111 | echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ | 119 | echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ |
112 | echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ | 120 | echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ |
113 | endif | 121 | endif |
114 | ifeq ($(CONFIG_LIBSDK_DEP),y) | 122 | ifeq ($(CONFIG_LIBSDK_DEP),y) |
115 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ | 123 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ |
116 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ | 124 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ |
117 | endif | 125 | endif |
118 | ifeq ($(CONFIG_LIBSWORD_DEP),y) | 126 | ifeq ($(CONFIG_LIBSWORD_DEP),y) |
119 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ | 127 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ |
120 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ | 128 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ |
121 | endif | 129 | endif |
122 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages | 130 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages |
123 | @echo Generating dependency information... | 131 | @echo Generating dependency information... |
124 | # add to subdir-y, and add descend rules | 132 | # add to subdir-y, and add descend rules |
125 | @cat $(TOPDIR)/packages | grep -v '^#' | \ | 133 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-modplugin | 1 | Package: opie-modplugin |
2 | Files: plugins/codecs/libmodplugin.so* | 2 | Files: plugins/codecs/libmodplugin.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: libs | 4 | Section: libs |
5 | Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 2.0.2-$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | Description: MOD/XM/S3M/IT plugin using libmodplug | 9 | Description: MOD/XM/S3M/IT plugin using libmodplug |
10 | Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment. | 10 | 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 | |||
@@ -54,33 +54,33 @@ | |||
54 | extern QString addressbookPersonalVCardName(); | 54 | extern QString addressbookPersonalVCardName(); |
55 | 55 | ||
56 | AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | 56 | AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, |
57 | WFlags f ) | 57 | WFlags f ) |
58 | : QMainWindow( parent, name, f ), | 58 | : QMainWindow( parent, name, f ), |
59 | catMenu (0l), | 59 | catMenu (0l), |
60 | abEditor(0l), | 60 | abEditor(0l), |
61 | syncing(FALSE), | 61 | syncing(FALSE), |
62 | m_tableViewButton(0l), | 62 | m_tableViewButton(0l), |
63 | m_cardViewButton(0l) | 63 | m_cardViewButton(0l) |
64 | { | 64 | { |
65 | isLoading = true; | 65 | isLoading = true; |
66 | 66 | ||
67 | m_config.load(); | 67 | m_config.load(); |
68 | 68 | ||
69 | setCaption( tr("Contacts") ); | 69 | setCaption( tr("Contacts") ); |
70 | setIcon( Resource::loadPixmap( "AddressBook" ) ); | 70 | setIcon( Resource::loadPixmap( "addressbook/AddressBook" ) ); |
71 | 71 | ||
72 | // Settings for Main Menu | 72 | // Settings for Main Menu |
73 | // setToolBarsMovable( false ); | 73 | // setToolBarsMovable( false ); |
74 | setToolBarsMovable( !m_config.fixedBars() ); | 74 | setToolBarsMovable( !m_config.fixedBars() ); |
75 | setRightJustification( true ); | 75 | setRightJustification( true ); |
76 | 76 | ||
77 | QToolBar *bar = new QToolBar( this ); | 77 | QToolBar *bar = new QToolBar( this ); |
78 | bar->setHorizontalStretchable( TRUE ); | 78 | bar->setHorizontalStretchable( TRUE ); |
79 | 79 | ||
80 | QMenuBar *mbList = new QMenuBar( bar ); | 80 | QMenuBar *mbList = new QMenuBar( bar ); |
81 | mbList->setMargin( 0 ); | 81 | mbList->setMargin( 0 ); |
82 | 82 | ||
83 | QPopupMenu *edit = new QPopupMenu( mbList ); | 83 | QPopupMenu *edit = new QPopupMenu( mbList ); |
84 | mbList->insertItem( tr( "Contact" ), edit ); | 84 | mbList->insertItem( tr( "Contact" ), edit ); |
85 | 85 | ||
86 | // Category Menu | 86 | // Category Menu |
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 | |||
@@ -1,12 +1,12 @@ | |||
1 | Package: task-opie-today | 1 | Package: task-opie-today |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/pim | 3 | Section: opie/pim |
4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> | 4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION$EXTRAVERSION | 6 | Version: 0.5$EXTRAVERSION |
7 | Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin | 7 | Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin |
8 | License: GPL | 8 | License: GPL |
9 | Description: Task for basic Today app setup | 9 | Description: Task for basic Today app setup |
10 | Includes datebook and todolist plugins. | 10 | Includes datebook and todolist plugins. |
11 | 11 | ||
12 | Files: | 12 | Files: |
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 | |||
@@ -1,16 +1,16 @@ | |||
1 | Package: opie-multiauth | 1 | Package: opie-multiauth |
2 | Files: bin/multiauth apps/Applications/multiauth.desktop pics/security/multiauth.png | 2 | Files: bin/multiauth apps/Applications/multiauth.desktop pics/security/multiauth.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: opie-security | 8 | Depends: opie-security |
9 | Description: multi-plugin authentication demonstrator for Opie. | 9 | Description: multi-plugin authentication demonstrator for Opie. |
10 | This demonstration application allows us to use one or several | 10 | This demonstration application allows us to use one or several |
11 | ways to lock and unlock our device. Since it really locks your | 11 | ways to lock and unlock our device. Since it really locks your |
12 | PDA the way you configured it in the Security settings, you can | 12 | PDA the way you configured it in the Security settings, you can |
13 | map a button to it through the Buttons settings to lock your | 13 | map a button to it through the Buttons settings to lock your |
14 | PDA on demand, with one simple click. | 14 | PDA on demand, with one simple click. |
15 | You must install some opie-multiauth-* plugins, and configure | 15 | You must install some opie-multiauth-* plugins, and configure |
16 | them through opie-security, to really see its possibilities. | 16 | them through opie-security, to really see its possibilities. |
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 | |||
@@ -104,34 +104,33 @@ public: | |||
104 | { | 104 | { |
105 | QCString ch("QPE/QuickLauncher-"); | 105 | QCString ch("QPE/QuickLauncher-"); |
106 | ch += QString::number(getpid()); | 106 | ch += QString::number(getpid()); |
107 | qlChannel = new QCopChannel( ch, this); | 107 | qlChannel = new QCopChannel( ch, this); |
108 | connect( qlChannel, SIGNAL(received(const QCString&,const QByteArray&)), | 108 | connect( qlChannel, SIGNAL(received(const QCString&,const QByteArray&)), |
109 | this, SLOT(message(const QCString&,const QByteArray&)) ); | 109 | this, SLOT(message(const QCString&,const QByteArray&)) ); |
110 | } | 110 | } |
111 | 111 | ||
112 | static void exec( int /*argc*/, char **argv ) | 112 | static void exec( int /*argc*/, char **argv ) |
113 | { | 113 | { |
114 | QString appName = argv[0]; | 114 | QString appName = argv[0]; |
115 | int sep = appName.findRev( '/' ); | 115 | int sep = appName.findRev( '/' ); |
116 | if ( sep > 0 ) | 116 | if ( sep > 0 ) |
117 | appName = appName.mid( sep+1 ); | 117 | appName = appName.mid( sep+1 ); |
118 | 118 | ||
119 | appIface = 0; | 119 | appIface = 0; |
120 | if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) != QS_OK ) { | 120 | if ( ! ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) ) { |
121 | owarn << "Plugin does not support QuickLauncher interface" << oendl; | ||
122 | exit(-1); | 121 | exit(-1); |
123 | } | 122 | } |
124 | 123 | ||
125 | mainWindow = appIface->createMainWindow( appName ); | 124 | mainWindow = appIface->createMainWindow( appName ); |
126 | 125 | ||
127 | if ( mainWindow ) { | 126 | if ( mainWindow ) { |
128 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { | 127 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { |
129 | app->showMainDocumentWidget( mainWindow ); | 128 | app->showMainDocumentWidget( mainWindow ); |
130 | } else { | 129 | } else { |
131 | app->showMainWidget( mainWindow ); | 130 | app->showMainWidget( mainWindow ); |
132 | } | 131 | } |
133 | } else { | 132 | } else { |
134 | owarn << "Could not create application main window" << oendl; | 133 | owarn << "Could not create application main window" << oendl; |
135 | exit(-1); | 134 | exit(-1); |
136 | } | 135 | } |
137 | } | 136 | } |
diff --git a/dependencies.in b/dependencies.in index ce1ac96..357d994 100644 --- a/dependencies.in +++ b/dependencies.in | |||
@@ -69,16 +69,28 @@ | |||
69 | config LIBSDL_INC_DIR | 69 | config LIBSDL_INC_DIR |
70 | string "LIBSDL include dir" | 70 | string "LIBSDL include dir" |
71 | depends LIBSDL_DEP | 71 | depends LIBSDL_DEP |
72 | 72 | ||
73 | config LIBSWORD_DEP | 73 | config LIBSWORD_DEP |
74 | boolean "Have libsword > = 1.5.0" | 74 | boolean "Have libsword > = 1.5.0" |
75 | default "n" | 75 | default "n" |
76 | 76 | ||
77 | config LIBSWORD_LIB_DIR | 77 | config LIBSWORD_LIB_DIR |
78 | string "libsword library dir" | 78 | string "libsword library dir" |
79 | depends LIBSWORD_DEP | 79 | depends LIBSWORD_DEP |
80 | 80 | ||
81 | config LIBSWORD_INC_DIR | 81 | config LIBSWORD_INC_DIR |
82 | string "libsword include dir" | 82 | string "libsword include dir" |
83 | depends LIBSWORD_DEP | 83 | depends LIBSWORD_DEP |
84 | 84 | ||
85 | config LIBBLUEZ_DEP | ||
86 | boolean "Have bluez library" | ||
87 | default "n" | ||
88 | |||
89 | config LIBBLUEZ_LIB_DIR | ||
90 | string "libbluez library dir" | ||
91 | depends LIBBLUEZ_DEP | ||
92 | |||
93 | config LIBBLUEZ_INC_DIR | ||
94 | string "libbluez include dir" | ||
95 | depends LIBBLUEZ_DEP | ||
96 | |||
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 | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-keytabs | 1 | Package: opie-keytabs |
2 | Files: etc/keytabs/* | 2 | Files: etc/keytabs/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.6$EXTRAVERSION |
8 | License: GPL | 8 | License: GPL |
9 | Description: Opie keytabs for terminal applications | 9 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopie2 | 1 | Package: libopie2 |
2 | Files: | 2 | Files: |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.2$EXTRAVERSION |
8 | Depends: libopiecore2 ($QPE_VERSION), libopiedb2 ($QPE_VERSION), libopiemm2 ($QPE_VERSION), libopienet2 ($QPE_VERSION), libopiepim2 ($QPE_VERSION), libopieui2 ($QPE_VERSION) | 8 | Depends: libopiecore2 ($QPE_VERSION), libopiedb2 ($QPE_VERSION), libopiemm2 ($QPE_VERSION), libopienet2 ($QPE_VERSION), libopiepim2 ($QPE_VERSION), libopieui2 ($QPE_VERSION) |
9 | Provides: libopie2 | 9 | Provides: libopie2 |
10 | Description: Opie library 2.0 | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiecore2 | 1 | Package: libopiecore2 |
2 | Files: lib/libopiecore2.so.* | 2 | Files: lib/libopiecore2.so.* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.5$EXTRAVERSION |
8 | Depends: libqpe1 | 8 | Depends: libqpe1 |
9 | Provides: libopiecore2 | 9 | Provides: libopiecore2 |
10 | Description: Opie library 2.0 CORE | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiedb2 | 1 | Package: libopiedb2 |
2 | Files: lib/libopiedb2.so* | 2 | Files: lib/libopiedb2.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.2$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2 ($QPE_VERSION), libsqlite3-0 | sqlite3-bin | 8 | Depends: libqpe1, libopiecore2 ($QPE_VERSION), libsqlite3-0 | sqlite3-bin |
9 | Provides: libopiedb2 | 9 | Provides: libopiedb2 |
10 | Description: Opie library 2.1 DB | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiemm2 | 1 | Package: libopiemm2 |
2 | Files: lib/libopiemm2.so.* | 2 | Files: lib/libopiemm2.so.* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.2$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2 (1.8.2) | 8 | Depends: libqpe1, libopiecore2 (1.8.2) |
9 | Provides: libopiemm2 | 9 | Provides: libopiemm2 |
10 | Description: Opie library 2.0 MM | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopienet2 | 1 | Package: libopienet2 |
2 | Files: lib/libopienet2.so.* etc/manufacturers | 2 | Files: lib/libopienet2.so.* etc/manufacturers |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/libs | 4 | Section: opie/libs |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.4$EXTRAVERSION |
8 | Depends: libopiecore2, libpcap0.8 (>=0.7.2) | 8 | Depends: libopiecore2, libpcap0.8 (>=0.7.2) |
9 | Provides: libopienet2 | 9 | Provides: libopienet2 |
10 | Description: Opie library 2.0 NET | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiepim2 | 1 | Package: libopiepim2 |
2 | Files: lib/libopiepim2.so.* | 2 | Files: lib/libopiepim2.so.* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.3$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2 (>=1.8.0) | 8 | Depends: libqpe1, libopiecore2 (>=1.8.0) |
9 | Provides: libopiepim2 | 9 | Provides: libopiepim2 |
10 | Description: Opie library 2.0 PIM | 10 | 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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopiesecurity2 | 1 | Package: libopiesecurity2 |
2 | Files: lib/libopiesecurity2.so.* | 2 | Files: lib/libopiesecurity2.so.* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.5$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2, libopieui2 | 8 | Depends: libqpe1, libopiecore2, libopieui2 |
9 | Provides: libopiesecurity2 | 9 | Provides: libopiesecurity2 |
10 | Recommends: opie-multiauth-pinplugin | opie-multiauth-noticeplugin | opie-multiauth-dummyplugin | opie-multiauth-bluepingplugin, opie-security | 10 | Recommends: opie-multiauth-pinplugin | opie-multiauth-noticeplugin | opie-multiauth-dummyplugin | opie-multiauth-bluepingplugin, opie-security |
11 | Description: Opie library 2.0 security | 11 | Description: Opie library 2.0 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 | |||
@@ -29,30 +29,31 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <opie2/oapplication.h> | 31 | #include <opie2/oapplication.h> |
32 | #include <opie2/odebug.h> | 32 | #include <opie2/odebug.h> |
33 | 33 | ||
34 | #include "oresource.h" | 34 | #include "oresource.h" |
35 | 35 | ||
36 | 36 | ||
37 | #ifdef QWS | 37 | #ifdef QWS |
38 | namespace Resource | 38 | namespace Resource |
39 | { | 39 | { |
40 | 40 | ||
41 | QPixmap loadPixmap( const QString& pix ) | 41 | QPixmap loadPixmap( const QString& pix ) |
42 | { | 42 | { |
43 | QString filename; | 43 | QString filename; |
44 | filename.sprintf( "%s/%s.png", (const char*) oApp->qpeDir(), (const char*) pix ); | 44 | filename.sprintf( "%s/%s.png", (const char*) oApp->qpeDir(), (const char*) pix ); |
45 | odebug << "Load pixmap " << filename << oendl; | ||
45 | QPixmap pixmap( filename ); | 46 | QPixmap pixmap( filename ); |
46 | if ( pixmap.isNull() ) | 47 | if ( pixmap.isNull() ) |
47 | { | 48 | { |
48 | odebug << "libopie2 resource: can't find pixmap " << filename << oendl; | 49 | odebug << "libopie2 resource: can't find pixmap " << filename << oendl; |
49 | } | 50 | } |
50 | return pixmap; | 51 | return pixmap; |
51 | }; | 52 | }; |
52 | 53 | ||
53 | }; | 54 | }; |
54 | 55 | ||
55 | #endif | 56 | #endif |
56 | 57 | ||
57 | 58 | ||
58 | 59 | ||
diff --git a/libqtaux/libqtaux.control b/libqtaux/libqtaux.control index d801a98..996962f 100644 --- a/libqtaux/libqtaux.control +++ b/libqtaux/libqtaux.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libqtaux2 | 1 | Package: libqtaux2 |
2 | Files: lib/libqtaux2.so.* | 2 | Files: lib/libqtaux2.so.* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 2.3.7$EXTRAVERSION |
8 | Depends: libqte2 | 8 | Depends: libqte2 |
9 | Provides: libqtaux | 9 | Provides: libqtaux |
10 | Description: Qt/Embedded Auxilliary Stuff | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: zkbapplet | 1 | Package: zkbapplet |
2 | Files: plugins/applets/libzkbapplet.so* pics/zkb-disabled.png share/zkb/*.xml bin/keyz-cfg apps/Settings/keyz-cfg.desktop pics/keyz-cfg.png share/zkb/zkb.xml.sample | 2 | Files: plugins/applets/libzkbapplet.so* pics/zkb-disabled.png share/zkb/*.xml bin/keyz-cfg apps/Settings/keyz-cfg.desktop pics/keyz-cfg.png share/zkb/zkb.xml.sample |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
8 | Description: ZKB Applet and configuration program | 8 | Description: ZKB Applet and configuration program |
9 | Obsoletes: keyz-cfg | 9 | Obsoletes: keyz-cfg |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | 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 | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-dagger | 1 | Package: opie-dagger |
2 | Files: plugins/application/libdagger.so* bin/dagger pics/dagger apps/Applications/dagger.desktop | 2 | Files: plugins/application/libdagger.so* bin/dagger pics/dagger apps/Applications/dagger.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Depends: task-opie-minimal, libopiecore2, libopieui2 | 5 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Maintainer: Dan Williams (drw@handhelds.org) | 7 | Maintainer: Dan Williams (drw@handhelds.org) |
8 | Description: A Bible study program utilizing the Sword library. | 8 | Description: A Bible study program utilizing the Sword library. |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | 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,11 +1,11 @@ | |||
1 | Package: opie-bounce | 1 | Package: opie-bounce |
2 | Files: plugins/application/libbounce.so* bin/bounce apps/Games/bounce.desktop pics/bounce/*.png | 2 | Files: plugins/application/libbounce.so* bin/bounce apps/Games/bounce.desktop pics/bounce/*.png |
3 | Version: $QPE_VERSION$EXTRAVERSION | 3 | Version: 0.6$EXTRAVERSION |
4 | Depends: task-opie-minimal, libopiecore2 | 4 | Depends: task-opie-minimal, libopiecore2 |
5 | Priority: optional | 5 | Priority: optional |
6 | Section: opie/games | 6 | Section: opie/games |
7 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 7 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
8 | Architecture: arm | 8 | Architecture: arm |
9 | License: GPL | 9 | License: GPL |
10 | Description: bounce | 10 | Description: bounce |
11 | A JezzGame like game for Qtopia. | 11 | A JezzGame like game for Qtopia. |
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,11 +1,11 @@ | |||
1 | Package: opie-buzzword | 1 | Package: opie-buzzword |
2 | Files: plugins/application/libbuzzword.so* bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords | 2 | Files: plugins/application/libbuzzword.so* bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords |
3 | Version: $QPE_VERSION$EXTRAVERSION | 3 | Version: 1.1$EXTRAVERSION |
4 | Depends: task-opie-minimal,libopiecore2 | 4 | Depends: task-opie-minimal,libopiecore2 |
5 | Priority: optional | 5 | Priority: optional |
6 | Section: opie/games | 6 | Section: opie/games |
7 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 7 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
8 | Architecture: arm | 8 | Architecture: arm |
9 | License: GPL | 9 | License: GPL |
10 | Description: BuzzWord | 10 | Description: BuzzWord |
11 | A BuzzWord Bingo for the Opie environment. | 11 | A BuzzWord Bingo for the Opie environment. |
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 | |||
@@ -1,13 +1,13 @@ | |||
1 | Package: opie-kbill | 1 | Package: opie-kbill |
2 | Files: bin/kbill apps/Games/kbill.desktop pics/kbill/* | 2 | Files: bin/kbill apps/Games/kbill.desktop pics/kbill/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Mark Westcott <mark@houseoffish.org> | 5 | Maintainer: Mark Westcott <mark@houseoffish.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.8$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: The famous hit Bill game | 10 | Description: The famous hit Bill game |
11 | Hit Bill as hard as you can before he | 11 | Hit Bill as hard as you can before he |
12 | infects your network with a wannabe | 12 | infects your network with a wannabe |
13 | OS. | 13 | OS. |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-kcheckers | 1 | Package: opie-kcheckers |
2 | Files: plugins/application/libkcheckers.so* bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers | 2 | Files: plugins/application/libkcheckers.so* bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: leseb <prudhomme@laposte.net> | 5 | Maintainer: leseb <prudhomme@laposte.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.3$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopiecore2 | 8 | Depends: task-opie-minimal, libopiecore2 |
9 | Description: The game of Checkers | 9 | Description: The game of Checkers |
10 | A game for the Opie environment. | 10 | 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,11 +1,11 @@ | |||
1 | Package: opie-kpacman | 1 | Package: opie-kpacman |
2 | Files: plugins/applications/libkpacman.so* bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman | 2 | Files: plugins/applications/libkpacman.so* bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman |
3 | Version: $QPE_VERSION$EXTRAVERSION | 3 | Version: 0.3.1$EXTRAVERSION |
4 | Depends: task-opie-minimal | 4 | Depends: task-opie-minimal |
5 | Priority: optional | 5 | Priority: optional |
6 | Section: opie/games | 6 | Section: opie/games |
7 | Maintainer: Catalin Climov <catalin@climov.com> | 7 | Maintainer: Catalin Climov <catalin@climov.com> |
8 | Architecture: arm | 8 | Architecture: arm |
9 | License: GPL | 9 | License: GPL |
10 | Description: Kpacman | 10 | Description: Kpacman |
11 | A Pacman clone for Qtopia. | 11 | A Pacman clone for Qtopia. |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-camera | 1 | Package: opie-camera |
2 | Files: lib/libcamera.* bin/camera bin/capture pics/camera apps/Applications/camera.desktop | 2 | Files: lib/libcamera.* bin/camera bin/capture pics/camera apps/Applications/camera.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/multimedia | 4 | Section: opie/multimedia |
5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@Vanille.de> | 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@Vanille.de> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.0.1$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2, libopieui2 | 8 | Depends: libqpe1, libopiecore2, libopieui2 |
9 | Description: A Camera Application | 9 | Description: A Camera Application |
10 | A Camera Application to use with the Sharp CE-AG06. | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-mediaplayer2-codecs | 1 | Package: opie-mediaplayer2-codecs |
2 | Files: root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbisidec.so* root/usr/lib/libxine.so* root/usr/lib/xine/* | 2 | Files: root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbisidec.so* root/usr/lib/libxine.so* root/usr/lib/xine/* |
3 | Section: ;ibs | 3 | Section: ;ibs |
4 | Essential: no | 4 | Essential: no |
5 | Priority: optional | 5 | Priority: optional |
6 | Version: $QPE_VERSION$EXTRAVERSION | 6 | Version: 0.7$EXTRAVERSION |
7 | Architecture: arm | 7 | Architecture: arm |
8 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> | 8 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> |
9 | Depends: libc6 (>= 2.1), opie-mediaplayer2 | 9 | Depends: libc6 (>= 2.1), opie-mediaplayer2 |
10 | Description: Codecs for opieplayer 2 | 10 | Description: Codecs for opieplayer 2 |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-powercord | 1 | Package: opie-powercord |
2 | Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord | 2 | Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/multimedia | 4 | Section: opie/multimedia |
5 | Maintainer: Camilo Mesias <camilo@mesias.co.uk>, ljp <lpotter@trolltech.com> | 5 | Maintainer: Camilo Mesias <camilo@mesias.co.uk>, ljp <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.8$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | Description: Guitar Chord generator application | 9 | Description: Guitar Chord generator application |
10 | Allows naming of chords using base note and key. Fretboard diagrams are | 10 | Allows naming of chords using base note and key. Fretboard diagrams are |
11 | produced illustrating ways to play the chord. | 11 | produced illustrating ways to play the chord. |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libetpan | 1 | Package: libetpan |
2 | Files: usr/lib/libetpan* | 2 | Files: usr/lib/libetpan* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: system | 4 | Section: system |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.33$EXTRAVERSION |
8 | Depends: libssl0.9.7 | 8 | Depends: libssl0.9.7 |
9 | Description: libetpan mail/news library - A version of libetpan patched for Opies mailing app | 9 | Description: libetpan mail/news library - A version of libetpan patched for Opies mailing app |
10 | License: LGPL | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libmailwrapper | 1 | Package: libmailwrapper |
2 | Files: lib/libmailwrapper.so* | 2 | Files: lib/libmailwrapper.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: libs | 4 | Section: libs |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.6$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopiecore2, libopieui2, libetpan (>= 0.33pre) | 8 | Depends: task-opie-minimal, libopiecore2, libopieui2, libetpan (>= 0.33pre) |
9 | Description: wrapper lib needed by Opie's mailer | 9 | Description: wrapper lib needed by Opie's mailer |
10 | License: LGPL | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-mailapplet | 1 | Package: opie-mailapplet |
2 | Files: plugins/applets/libmailapplet.so* | 2 | Files: plugins/applets/libmailapplet.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.5$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopiecore2, opie-mail | 8 | Depends: task-opie-minimal, libopiecore2, opie-mail |
9 | Description: A Biff-like mailchecker | 9 | Description: A Biff-like mailchecker |
10 | License: LGPL | 10 | 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 | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-rdesktop | 1 | Package: opie-rdesktop |
2 | Files: bin/ordesktop pics/opierdesktop apps/Applications/ordesktop.desktop | 2 | Files: bin/ordesktop pics/opierdesktop apps/Applications/ordesktop.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> | 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.2.0$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | Description: Remote Desktop Protocol (RDP) Client | 9 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-bluepin | 1 | Package: opie-bluepin |
2 | Files: plugins/application/libbluepin.so* bin/bluepin | 2 | Files: plugins/application/libbluepin.so* bin/bluepin |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Holger Freyther <zecke@handhelds.org> | 5 | Maintainer: Holger Freyther <zecke@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.3.4$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: Bluetooth pin application | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-bluetoothmanager | 1 | Package: opie-bluetoothmanager |
2 | Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/* | 2 | Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Maximilian Reiß <max.reiss@gmx.de> | 5 | Maintainer: Maximilian Reiß <max.reiss@gmx.de> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.5.4$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopietooth1, opie-bluepin | 8 | Depends: task-opie-minimal, libopietooth1, opie-bluepin |
9 | License: GPL | 9 | License: GPL |
10 | Description: Bluetooth Manager application | 10 | 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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-wellenreiter | 1 | Package: opie-wellenreiter |
2 | Files: bin/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop | 2 | Files: bin/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> | 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.0.3$EXTRAVERSION |
8 | Depends: libqpe1, libpcap0.8 (>=0.7.2), libopiecore2, libopienet2, libopieui2 | 8 | Depends: libqpe1, libpcap0.8 (>=0.7.2), libopiecore2, libopienet2, libopieui2 |
9 | Description: A WaveLAN Network Monitor | 9 | Description: A WaveLAN Network Monitor |
10 | A WaveLAN Network Monitor/Sniffer for the Opie Environment. | 10 | 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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-multiauth-bluepingplugin | 1 | Package: opie-multiauth-bluepingplugin |
2 | Files: plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth | 2 | Files: plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: libopiecore2, opie-security, bluez-utils (<= 2.3rel-hh5) | 8 | Depends: libopiecore2, opie-security, bluez-utils (<= 2.3rel-hh5) |
9 | Description: Blueping plugin for opie-security authentication. | 9 | Description: Blueping plugin for opie-security authentication. |
10 | This is a bluetooth-based authentication plugin (you need | 10 | This is a bluetooth-based authentication plugin (you need |
11 | to have another Bluetooth device around to use it). | 11 | to have another Bluetooth device around to use it). |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-multiauth-dummyplugin | 1 | Package: opie-multiauth-dummyplugin |
2 | Files: plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png | 2 | Files: plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: libopiecore2, opie-security | 8 | Depends: libopiecore2, opie-security |
9 | Description: Dummy plugin for opie-security authentication. | 9 | Description: Dummy plugin for opie-security authentication. |
10 | This is a very simple authentication plugin (you just have | 10 | This is a very simple authentication plugin (you just have |
11 | to press a button basically), for demonstration purpose. | 11 | to press a button basically), for demonstration purpose. |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-multiauth-noticeplugin | 1 | Package: opie-multiauth-noticeplugin |
2 | Files: plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png | 2 | Files: plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.1$EXTRAVERSION |
8 | Depends: libopiecore2, opie-security | 8 | Depends: libopiecore2, opie-security |
9 | Description: Notice plugin for opie-security authentication. | 9 | Description: Notice plugin for opie-security authentication. |
10 | It allows you to display e.g. a notice from your legal departement. | 10 | It allows you to display e.g. a notice from your legal departement. |
11 | 11 | ||
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-multiauth-pinplugin | 1 | Package: opie-multiauth-pinplugin |
2 | Files: plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png | 2 | Files: plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: libopiecore2, opie-security | 8 | Depends: libopiecore2, opie-security |
9 | Description: PIN plugin for opie-security authentication. | 9 | Description: PIN plugin for opie-security authentication. |
10 | Simple PIN-based authentication plugin (replicate the functionality | 10 | Simple PIN-based authentication plugin (replicate the functionality |
11 | Qtopia has, or Opie used to have, without plugins). | 11 | Qtopia has, or Opie used to have, without plugins). |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-sh | 1 | Package: opie-sh |
2 | Files: bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html | 2 | Files: bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/sh | 4 | Section: opie/sh |
5 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 5 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.5$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: A QDialog shell frontend | 10 | Description: A QDialog shell frontend |
11 | A program to let you use various dialogs from the console (or a shell script) | 11 | A program to let you use various dialogs from the console (or a shell script) |
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,11 +1,11 @@ | |||
1 | Package: opie-sh-wavelanchooser | 1 | Package: opie-sh-wavelanchooser |
2 | Files: bin/opie-sh-wavelanchooser.sh apps/Opie-SH/opie-sh-wavelanchooser.desktop pics/opie-sh-scripts/qtwavelan.png | 2 | Files: bin/opie-sh-wavelanchooser.sh apps/Opie-SH/opie-sh-wavelanchooser.desktop pics/opie-sh-scripts/qtwavelan.png |
3 | Installed-Size: 0 | 3 | Installed-Size: 0 |
4 | Version: $QPE_VERSION$EXTRAVERSION | 4 | Version: 0.1$EXTRAVERSION |
5 | Depends: task-opie-minimal (1.5.0+), opie-sh | 5 | Depends: task-opie-minimal (1.5.0+), opie-sh |
6 | Priority: optional | 6 | Priority: optional |
7 | Section: opie/sh | 7 | Section: opie/sh |
8 | Maintainer: gonz <gonz@directbox.com> | 8 | Maintainer: gonz <gonz@directbox.com> |
9 | Architecture: all | 9 | Architecture: all |
10 | License: GPL | 10 | License: GPL |
11 | Description: Frontend to choose wavelan config | 11 | Description: Frontend to choose wavelan config |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-gsmtool | 1 | Package: opie-gsmtool |
2 | Files: plugins/application/libgsmtool.so* bin/gsmtool apps/Applications/gsmtool.desktop pics/gsmtool | 2 | Files: plugins/application/libgsmtool.so* bin/gsmtool apps/Applications/gsmtool.desktop pics/gsmtool |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: David Woodhouse <dwmw2@infradead.org> | 5 | Maintainer: David Woodhouse <dwmw2@infradead.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.0.0$EXTRAVERSION |
8 | Depends: task-opie-minimal, gsmlib | 8 | Depends: task-opie-minimal, gsmlib |
9 | License: Public Domain | 9 | License: Public Domain |
10 | Description: GSMTool program | 10 | Description: GSMTool program |
11 | An GSM phone utility program for the Opie environment. | 11 | An GSM phone utility program for the Opie environment. |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-ubrowser | 1 | Package: opie-ubrowser |
2 | Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png plugins/application/libubrowser.so* | 2 | Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png plugins/application/libubrowser.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 5 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.1$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: A very small web browser | 10 | Description: A very small web browser |
diff --git a/scripts/GeneratePackageMake b/scripts/GeneratePackageMake index 099d3e8..9d692a9 100755 --- a/scripts/GeneratePackageMake +++ b/scripts/GeneratePackageMake | |||
@@ -22,36 +22,36 @@ cat << MAKEFILEHEADER | |||
22 | # | 22 | # |
23 | 23 | ||
24 | define GenerateMTControl | 24 | define GenerateMTControl |
25 | @echo "Generating -mt control file for \$(basename \$<)" | 25 | @echo "Generating -mt control file for \$(basename \$<)" |
26 | @\$(OPIEDIR)/scripts/tothreaded \$< \$(OPIEDIR)/AllThreadedPackages | 26 | @\$(OPIEDIR)/scripts/tothreaded \$< \$(OPIEDIR)/AllThreadedPackages |
27 | endef | 27 | endef |
28 | 28 | ||
29 | # | 29 | # |
30 | # package one control file | 30 | # package one control file |
31 | # arg 1 : directory from OPIEROOT where control file resides | 31 | # arg 1 : directory from OPIEROOT where control file resides |
32 | # arg 2 : control file basename without -mt (no .control) | 32 | # arg 2 : control file basename without -mt (no .control) |
33 | # arg 3 : control file basename with -mt if needed | 33 | # arg 3 : control file basename with -mt if needed |
34 | # arg 4 : package name (value specified by Package: ...) | 34 | # arg 4 : package name (value specified by Package: ...) |
35 | # | 35 | # |
36 | 36 | ||
37 | define DoPackage | 37 | define DoPackage |
38 | @echo \"Building ipk of \$(4)\" | 38 | echo \"Building ipk of \$(4)\" |
39 | @( \$(ForSubst) ) > \$(TOPDIR)/scripts/subst | 39 | ( \$(ForSubst) ) > \$(TOPDIR)/scripts/subst |
40 | @( \$(ForFileSubst) ) > \$(TOPDIR)/scripts/Filesubst | 40 | ( \$(ForFileSubst) ) > \$(TOPDIR)/scripts/Filesubst |
41 | @( cd \$(OPIEDIR); \\ | 41 | ( cd \$(OPIEDIR); \\ |
42 | \$(OPIEDIR)/scripts/mkipkg \\ | 42 | \$(OPIEDIR)/scripts/mkipkg \\ |
43 | --subst=\$(OPIEDIR)/scripts/subst \\ | 43 | --subst=\$(OPIEDIR)/scripts/subst \\ |
44 | --filesubst=\$(OPIEDIR)/scripts/filesubst \\ | 44 | --filesubst=\$(OPIEDIR)/scripts/filesubst \\ |
45 | --control=\$(OPIEDIR)/\$(1)/\$(3).control \\ | 45 | --control=\$(OPIEDIR)/\$(1)/\$(3).control \\ |
46 | --prerm=\$(OPIEDIR)/\$(1)/\$(2).prerm \\ | 46 | --prerm=\$(OPIEDIR)/\$(1)/\$(2).prerm \\ |
47 | --preinst=\$(OPIEDIR)/\$(1)/\$(2).preinst \\ | 47 | --preinst=\$(OPIEDIR)/\$(1)/\$(2).preinst \\ |
48 | --postrm=\$(OPIEDIR)/\$(1)/\$(2).postrm \\ | 48 | --postrm=\$(OPIEDIR)/\$(1)/\$(2).postrm \\ |
49 | --postinst=\$(OPIEDIR)/\$(1)/\$(2).postinst \\ | 49 | --postinst=\$(OPIEDIR)/\$(1)/\$(2).postinst \\ |
50 | --strip=\$(STRIP) \$(OPIEDIR); \\ | 50 | --strip=\$(STRIP) \$(OPIEDIR); \\ |
51 | rm -f \$(OPIEDIR)/Packages/\$(4)_*.ipk; \\ | 51 | rm -f \$(OPIEDIR)/Packages/\$(4)_*.ipk; \\ |
52 | mv *.ipk \$(OPIEDIR)/Packages; \\ | 52 | mv *.ipk \$(OPIEDIR)/Packages; \\ |
53 | touch \$(OPIEDIR)/Packages/\$(4) \\ | 53 | touch \$(OPIEDIR)/Packages/\$(4) \\ |
54 | ) || true | 54 | ) || true |
55 | endef | 55 | endef |
56 | 56 | ||
57 | # | 57 | # |
diff --git a/scripts/mkipkg b/scripts/mkipkg index a336371..2f020f4 100755 --- a/scripts/mkipkg +++ b/scripts/mkipkg | |||
@@ -231,65 +231,69 @@ createFileList() | |||
231 | fi | 231 | fi |
232 | realFileList=$file" $realFileList" | 232 | realFileList=$file" $realFileList" |
233 | fi | 233 | fi |
234 | done | 234 | done |
235 | 235 | ||
236 | _popd | 236 | _popd |
237 | 237 | ||
238 | if [ $missing = 1 ]; then | 238 | if [ $missing = 1 ]; then |
239 | return 1 | 239 | return 1 |
240 | fi | 240 | fi |
241 | 241 | ||
242 | setVar $2 "$realFileList" | 242 | setVar $2 "$realFileList" |
243 | } | 243 | } |
244 | 244 | ||
245 | stripFile() | 245 | stripFile() |
246 | { | 246 | { |
247 | if [ -f $1 -a -x $1 ]; then | 247 | if [ ! -h $1 -a -f $1 -a -x $1 ]; then |
248 | $strip --strip-all $1 | 248 | $strip -p --strip-all $1 |
249 | fi | 249 | fi |
250 | } | 250 | } |
251 | 251 | ||
252 | substFile() | 252 | substFile() |
253 | { | 253 | { |
254 | local oldfile=$1 | 254 | local oldfile=$1 |
255 | 255 | ||
256 | if [ ! -e $2 ]; then return 1; fi | 256 | if [ ! -e $2 ]; then return 1; fi |
257 | 257 | ||
258 | if [ -e $oldfile -o -L $oldfile ]; then | 258 | if [ -e $oldfile -o -L $oldfile ]; then |
259 | newfile=`echo $oldfile|sed -f $2|sed -e's,^/,,g'` | 259 | newfile=`echo $oldfile|sed -f $2|sed -e's,^/,,g'` |
260 | olddir=`dirname $oldfile` | 260 | olddir=`dirname $oldfile` |
261 | base=`basename $oldfile` | 261 | base=`basename $oldfile` |
262 | newdir=`dirname $newfile` | 262 | newdir=`dirname $newfile` |
263 | 263 | ||
264 | # echo >&2 moving $oldfile to $newfile | 264 | # echo >&2 moving $oldfile to $newfile |
265 | 265 | ||
266 | if [ "$newdir" = "$olddir" ]; then | 266 | if [ "$newdir" = "$olddir" ]; then |
267 | return 0 | 267 | return 0 |
268 | fi | 268 | fi |
269 | 269 | ||
270 | mkdir -p $newdir | 270 | mkdir -p $newdir |
271 | mv $olddir/$base $newfile | 271 | mv $olddir/$base $newfile |
272 | rmdir -p $olddir 2>/dev/null | 272 | rmdir -p $olddir 2>/dev/null |
273 | fi | 273 | fi |
274 | } | 274 | } |
275 | 275 | ||
276 | stripFiles() | 276 | stripFiles() |
277 | { | 277 | { |
278 | for f in $1; do | 278 | for f in $1; do |
279 | # do not strip links | ||
280 | if [ ! -h ./$f ] | ||
281 | then | ||
279 | stripFile ./$f | 282 | stripFile ./$f |
283 | fi | ||
280 | done | 284 | done |
281 | } | 285 | } |
282 | 286 | ||
283 | substFiles() | 287 | substFiles() |
284 | { | 288 | { |
285 | for f in $1; do | 289 | for f in $1; do |
286 | substFile ./$f | 290 | substFile ./$f |
287 | done | 291 | done |
288 | } | 292 | } |
289 | 293 | ||
290 | substAndStripFiles() | 294 | substAndStripFiles() |
291 | { | 295 | { |
292 | for f in $1; do | 296 | for f in $1; do |
293 | stripFile ./$f | 297 | stripFile ./$f |
294 | substFile ./$f $2 | 298 | substFile ./$f $2 |
295 | done | 299 | done |
diff --git a/scripts/tothreaded b/scripts/tothreaded index 31ed31e..f916ad8 100755 --- a/scripts/tothreaded +++ b/scripts/tothreaded | |||