summaryrefslogtreecommitdiff
authorwimpie <wimpie>2005-01-04 01:49:47 (UTC)
committer wimpie <wimpie>2005-01-04 01:49:47 (UTC)
commit45c241b9bac51d6538469ba8e306e8d88f639ff7 (patch) (unidiff)
tree6bac89512073ad03c2cd99198cd498e8078c2640
parente90b4cb5253669d44b1eb1ed7fb2be30d68033c0 (diff)
downloadopie-45c241b9bac51d6538469ba8e306e8d88f639ff7.zip
opie-45c241b9bac51d6538469ba8e306e8d88f639ff7.tar.gz
opie-45c241b9bac51d6538469ba8e306e8d88f639ff7.tar.bz2
CONTROL files : changed VERSION string
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--development/keyview/opie-keyview.control2
-rw-r--r--development/performance/opie-performance.control2
-rw-r--r--etc/opie-keytabs.control2
-rw-r--r--examples/todayplugin/opie-today-exampleplugin.control2
-rw-r--r--freetype/opie-freetype.control2
-rw-r--r--inputmethods/handwriting/opie-handwriting-graffitiset.control2
-rw-r--r--libqtaux/libqtaux.control2
-rw-r--r--mkspecs/qws/linux-arm-g++/qmake.conf2
-rw-r--r--packages3
-rw-r--r--qt/control/libqte2.control2
-rwxr-xr-xscripts/tothreaded4
12 files changed, 17 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index f9f965b..a1fc32c 100644
--- a/Makefile
+++ b/Makefile
@@ -20,65 +20,65 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD
20# everything else depends on .depends, to ensure the dependencies are 20# everything else depends on .depends, to ensure the dependencies are
21# intact. 21# intact.
22# 22#
23# NOTE: The order in which things happen in this makefile is 23# NOTE: The order in which things happen in this makefile is
24 # -critical-. Do not rearrange this! 24 # -critical-. Do not rearrange this!
25 25
26all : $(TOPDIR)/.config 26all : $(TOPDIR)/.config
27 27
28# 28#
29# The IPK creation is a very slow process. If you want to only create some 29# The IPK creation is a very slow process. If you want to only create some
30# IPKs, e.g. the ones in library, then do 30# IPKs, e.g. the ones in library, then do
31 #make ipks IPK_START=library 31 #make ipks IPK_START=library
32# and then only the *.control files in this directory will be processed 32# and then only the *.control files in this directory will be processed
33ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config 33ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
34 @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ 34 @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \
35 prerm=`echo $${ctrl/.control/.prerm}`; \ 35 prerm=`echo $${ctrl/.control/.prerm}`; \
36 preinst=`echo $${ctrl/.control/.preinst}`; \ 36 preinst=`echo $${ctrl/.control/.preinst}`; \
37 postrm=`echo $${ctrl/.control/.postrm}`; \ 37 postrm=`echo $${ctrl/.control/.postrm}`; \
38 postinst=`echo $${ctrl/.control/.postinst}`; \ 38 postinst=`echo $${ctrl/.control/.postinst}`; \
39 echo "Building ipk of $$ctrl"; \ 39 echo "Building ipk of $$ctrl"; \
40 cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \ 40 cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \
41 done ) 41 done )
42 42
43ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config 43ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config
44 @> $(OPIEDIR)/AllThreadedPackages 44 @> $(OPIEDIR)/AllThreadedPackages
45 @find $(OPIEDIR)/ -type f -name \*.control | grep -v -- "-mt" | while read ctrl ; do \ 45 @find $(OPIEDIR)/ -type f -name \*.control | grep -v -- "-mt" | while read ctrl ; do \
46 grep "Package[ ]*:" $${ctrl} | sed "s+Package[ ]*:[ ]*++"; \ 46 grep "Package[ ]*:" $${ctrl} | sed "s+Package[ ]*:[ ]*++"; \
47 done | sort | uniq >> $(OPIEDIR)/AllThreadedPackages 47 done | sort | uniq >> $(OPIEDIR)/AllThreadedPackages
48 @find $(OPIEDIR)/ -type f -name \*.control | while read ctrl ; do \ 48 @find $(OPIEDIR)/ -type f -name \*.control | while read ctrl ; do \
49 echo "Converting $$ctrl to -mt package"; \ 49 echo "Converting $$ctrl to -mt package"; \
50 nctrl=`$(OPIEDIR)/scripts/tothreaded $$ctrl $(OPIEDIR)/AllThreadedPackages`; \ 50 nctrl=`$(OPIEDIR)/scripts/tothreaded $$ctrl $(OPIEDIR)/AllThreadedPackages`; \
51 echo "Building ipk of $$ctrl"; \ 51 echo "Building ipk of $$ctrl"; \
52 [ -n $$nctrl ] && cd $(OPIEDIR) && $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$nctrl --prerm=$${nctrl/\.control$$/.prerm/} --preinst=$${nctrl/\.control$$/.preinst/} --postrm=$${nctrl/\.control$$/.postrm/} --postinst=$${nctrl/\.control$$/.postinst/} --strip=$(STRIP) $(OPIEDIR); \ 52 [ -n $$nctrl ] && cd $(OPIEDIR) && $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$nctrl --prerm=$${nctrl/-mt.control/.prerm} --preinst=$${nctrl/-mt.control/.preinst} --postrm=$${nctrl/-mt.control/.postrm} --postinst=$${nctrl/-mt.control/.postinst} --strip=$(STRIP) $(OPIEDIR); \
53 done 53 done
54 @rm -f $(OPIEDIR)/AllThreadedPackages 54 @rm -f $(OPIEDIR)/AllThreadedPackages
55 55
56FORCE: 56FORCE:
57 57
58$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 58$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
59 59
60all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 60all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
61 61
62clean-configs : 62clean-configs :
63 @echo "Wiping generated config.in files..." 63 @echo "Wiping generated config.in files..."
64 @-rm -f $(configs) 64 @-rm -f $(configs)
65 65
66ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),) 66ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),)
67 include $(TOPDIR)/.depends.cfgs 67 include $(TOPDIR)/.depends.cfgs
68endif 68endif
69 69
70all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 70all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
71 71
72$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) 72$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
73 $(call descend,scripts/kconfig,conf) 73 $(call descend,scripts/kconfig,conf)
74 @if [ ! -e $@ ]; then \ 74 @if [ ! -e $@ ]; then \
75 cp $(TOPDIR)/def-configs/opie $@; \ 75 cp $(TOPDIR)/def-configs/opie $@; \
76 fi 76 fi
77 @$(MAKE) -C scripts/kconfig conf 77 @$(MAKE) -C scripts/kconfig conf
78 ./scripts/kconfig/conf -s ./config.in 78 ./scripts/kconfig/conf -s ./config.in
79 79
80export 80export
81 81
82ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 82ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
83 83
84export include-config := 1 84export include-config := 1
diff --git a/development/keyview/opie-keyview.control b/development/keyview/opie-keyview.control
index 7adcbb8..4c9009f 100644
--- a/development/keyview/opie-keyview.control
+++ b/development/keyview/opie-keyview.control
@@ -1,9 +1,9 @@
1Package: opie-keyview 1Package: opie-keyview
2Files: plugins/inputmethods/libkeyview.so* 2Files: plugins/inputmethods/libkeyview.so*
3Priority: optional 3Priority: optional
4Section: opie/inputmethods 4Section: opie/inputmethods
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION 7Version: $QPE_VERSION$EXTRAVERSION
8Depends: task-opie-minimal 8Depends: task-opie-minimal
9Description: Keyview Development Inputmethod 9Description: Keyview Development Inputmethod
diff --git a/development/performance/opie-performance.control b/development/performance/opie-performance.control
index 89157f9..194b378 100644
--- a/development/performance/opie-performance.control
+++ b/development/performance/opie-performance.control
@@ -1,10 +1,10 @@
1Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop 1Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop
2Priority: optional 2Priority: optional
3Section: opie/other 3Section: opie/other
4Maintainer: Trolltech (www.trolltech.com) 4Maintainer: Trolltech (www.trolltech.com)
5Architecture: $CPU_ARCH 5Architecture: $CPU_ARCH
6Arch: $DEVICE_ARCH 6Arch: $DEVICE_ARCH
7Version: $QPE_VERSION-10 7Version: $QPE_VERSION$EXTRAVERSION
8Depends: opie-taskbar 8Depends: opie-taskbar
9Description: Graphics performance tester 9Description: Graphics performance tester
10 Graphics performance tester for Qtopia. 10 Graphics performance tester for Qtopia.
diff --git a/etc/opie-keytabs.control b/etc/opie-keytabs.control
index 456d780..e3d83de 100644
--- a/etc/opie-keytabs.control
+++ b/etc/opie-keytabs.control
@@ -1,9 +1,9 @@
1Package: opie-keytabs 1Package: opie-keytabs
2Files: etc/keytabs/* 2Files: etc/keytabs/*
3Priority: optional 3Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: 0.6-$SUB_VERSION 7Version: $QPE_VERSION$EXTRAVERSION
8License: GPL 8License: GPL
9Description: Opie keytabs for terminal applications 9Description: Opie keytabs for terminal applications
diff --git a/examples/todayplugin/opie-today-exampleplugin.control b/examples/todayplugin/opie-today-exampleplugin.control
index c6055d5..45a1fbd 100644
--- a/examples/todayplugin/opie-today-exampleplugin.control
+++ b/examples/todayplugin/opie-today-exampleplugin.control
@@ -1,9 +1,9 @@
1Package: opie-today-exampleplugin 1Package: opie-today-exampleplugin
2Files: plugins/today/libtodayexampleplugin.so* 2Files: plugins/today/libtodayexampleplugin.so*
3Priority: optional 3Priority: optional
4Section: opie/examples 4Section: opie/examples
5Maintainer: Maximilian Reiss <harlekin@handhelds.org> 5Maintainer: Maximilian Reiss <harlekin@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION 7Version: $QPE_VERSION$EXTRAVERSION
8Depends: libqte2, opie-today 8Depends: libqte2, opie-today
9Description: an example plugin for today 9Description: an example plugin for today
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control
index 0d3c83b..5c6d444 100644
--- a/freetype/opie-freetype.control
+++ b/freetype/opie-freetype.control
@@ -1,9 +1,9 @@
1Package: opie-freetype 1Package: opie-freetype
2Files: plugins/fontfactories/libfreetypefactory* 2Files: plugins/fontfactories/libfreetypefactory*
3Priority: optional 3Priority: optional
4Section: libs 4Section: libs
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION 7Version: $QPE_VERSION$EXTRAVERSION
8Depends: task-opie-minimal, libfreetype6 8Depends: task-opie-minimal, libfreetype6
9Description: Freetype fontfactory plugin 9Description: Freetype fontfactory plugin
diff --git a/inputmethods/handwriting/opie-handwriting-graffitiset.control b/inputmethods/handwriting/opie-handwriting-graffitiset.control
index f3a30f3..c829f84 100644
--- a/inputmethods/handwriting/opie-handwriting-graffitiset.control
+++ b/inputmethods/handwriting/opie-handwriting-graffitiset.control
@@ -1,10 +1,10 @@
1Package: opie-handwriting-graffitiset 1Package: opie-handwriting-graffitiset
2Files: etc/qimpen/graffiti* 2Files: etc/qimpen/graffiti*
3Priority: optional 3Priority: optional
4Section: opie/inputmethods 4Section: opie/inputmethods
5Maintainer: Jake Richardson <jake@asdfnews.org> 5Maintainer: Jake Richardson <jake@asdfnews.org>
6Architecture: all 6Architecture: all
7Version: $QPE_VERSION-$SUB_VERSION 7Version: $QPE_VERSION$EXTRAVERSION
8Depends: task-opie-minimal 8Depends: task-opie-minimal
9Description: Graffiti character set for the Handwriting inputmethod. 9Description: Graffiti character set for the Handwriting inputmethod.
10 Graffiti character set for the Handwriting inputmethod. 10 Graffiti character set for the Handwriting inputmethod.
diff --git a/libqtaux/libqtaux.control b/libqtaux/libqtaux.control
index a3a8ece..d801a98 100644
--- a/libqtaux/libqtaux.control
+++ b/libqtaux/libqtaux.control
@@ -1,10 +1,10 @@
1Package: libqtaux2 1Package: libqtaux2
2Files: lib/libqtaux2.so.* 2Files: lib/libqtaux2.so.*
3Priority: optional 3Priority: optional
4Section: opie/system 4Section: opie/system
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: 2.3.7-1 7Version: $QPE_VERSION$EXTRAVERSION
8Depends: libqte2 8Depends: libqte2
9Provides: libqtaux 9Provides: libqtaux
10Description: Qt/Embedded Auxilliary Stuff 10Description: Qt/Embedded Auxilliary Stuff
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index fcdad0e..91c4d44 100644
--- a/mkspecs/qws/linux-arm-g++/qmake.conf
+++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -1,33 +1,33 @@
1# 1
2# $Id$ 2# $Id$
3# 3#
4# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler 4# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
5# 5#
6 6
7 MAKEFILE_GENERATOR= UNIX 7 MAKEFILE_GENERATOR= UNIX
8 TEMPLATE = app 8 TEMPLATE = app
9 CONFIG += qt link_prl 9 CONFIG += qt link_prl
10 10
11 QMAKE_CC = $(CCACHE) $(DISTCC) $(shell which arm-linux-gcc) 11 QMAKE_CC = $(CCACHE) $(DISTCC) $(shell which arm-linux-gcc)
12 QMAKE_LEX = flex 12 QMAKE_LEX = flex
13 QMAKE_LEXFLAGS = 13 QMAKE_LEXFLAGS =
14 QMAKE_YACC = yacc 14 QMAKE_YACC = yacc
15 QMAKE_YACCFLAGS = -d 15 QMAKE_YACCFLAGS = -d
16 QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) 16 QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)
17 QMAKE_CFLAGS_WARN_ON= -Wall -W 17 QMAKE_CFLAGS_WARN_ON= -Wall -W
18 QMAKE_CFLAGS_WARN_OFF= 18 QMAKE_CFLAGS_WARN_OFF=
19 QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) 19 QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
20 QMAKE_CFLAGS_DEBUG= -g 20 QMAKE_CFLAGS_DEBUG= -g
21 QMAKE_CFLAGS_SHLIB= -fPIC 21 QMAKE_CFLAGS_SHLIB= -fPIC
22 QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses 22 QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
23 QMAKE_CFLAGS_THREAD= -D_REENTRANT 23 QMAKE_CFLAGS_THREAD= -D_REENTRANT
24 24
25 QMAKE_CXX = $(CCACHE) $(DISTCC) $(shell which arm-linux-g++) 25 QMAKE_CXX = $(CCACHE) $(DISTCC) $(shell which arm-linux-g++)
26 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) 26 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
27 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON 27 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
28 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF 28 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
29 QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE 29 QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
30 QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG 30 QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
31 QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB 31 QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
32 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC 32 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD 33 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
diff --git a/packages b/packages
index e84184c..4002d3f 100644
--- a/packages
+++ b/packages
@@ -92,66 +92,69 @@ CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro
92CONFIG_LIBQRSYNC rsync rsync.pro 92CONFIG_LIBQRSYNC rsync rsync.pro
93 CONFIG_LIBQTAUX libqtauxlibqtaux.pro 93 CONFIG_LIBQTAUX libqtauxlibqtaux.pro
94 CONFIG_LIBSLCOMPAT libslcompatlibslcompat.pro 94 CONFIG_LIBSLCOMPAT libslcompatlibslcompat.pro
95 CONFIG_LIBSQL libsqllibsql.pro 95 CONFIG_LIBSQL libsqllibsql.pro
96CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro 96CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
97CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro 97CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro
98 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro 98 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro
99 CONFIG_LIQUID noncore/styles/liquidliquid.pro 99 CONFIG_LIQUID noncore/styles/liquidliquid.pro
100 CONFIG_LOCKAPPLET core/applets/lockappletlockapplet.pro 100 CONFIG_LOCKAPPLET core/applets/lockappletlockapplet.pro
101 CONFIG_LOGOUTAPPLET core/applets/logoutappletlogoutapplet.pro 101 CONFIG_LOGOUTAPPLET core/applets/logoutappletlogoutapplet.pro
102 CONFIG_MAIL3 noncore/net/mail mail.pro 102 CONFIG_MAIL3 noncore/net/mail mail.pro
103CONFIG_MAILAPPLET noncore/net/mail/taskbarapplet taskbarapplet.pro 103CONFIG_MAILAPPLET noncore/net/mail/taskbarapplet taskbarapplet.pro
104 CONFIG_MAILIT noncore/unsupported/mailit mailit.pro 104 CONFIG_MAILIT noncore/unsupported/mailit mailit.pro
105CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro 105CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro
106 CONFIG_MEDIUMMOUNT noncore/settings/mediummountmediummount.pro 106 CONFIG_MEDIUMMOUNT noncore/settings/mediummountmediummount.pro
107 CONFIG_MEMORYAPPLET noncore/applets/memoryappletmemoryapplet.pro 107 CONFIG_MEMORYAPPLET noncore/applets/memoryappletmemoryapplet.pro
108 CONFIG_METAL noncore/styles/metalmetal.pro 108 CONFIG_METAL noncore/styles/metalmetal.pro
109 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro 109 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro
110 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro 110 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro
111 CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro 111 CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro
112 CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro 112 CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro
113CONFIG_MULTIAUTH_BLUEPING noncore/securityplugins/blueping bluepingplugin.pro 113CONFIG_MULTIAUTH_BLUEPING noncore/securityplugins/blueping bluepingplugin.pro
114CONFIG_MULTIAUTH_DUMMY noncore/securityplugins/dummy dummyplugin.pro 114CONFIG_MULTIAUTH_DUMMY noncore/securityplugins/dummy dummyplugin.pro
115CONFIG_MULTIAUTH_NOTICE noncore/securityplugins/notice noticeplugin.pro 115CONFIG_MULTIAUTH_NOTICE noncore/securityplugins/notice noticeplugin.pro
116CONFIG_MULTIAUTH_PIN noncore/securityplugins/pin pinplugin.pro 116CONFIG_MULTIAUTH_PIN noncore/securityplugins/pin pinplugin.pro
117 CONFIG_MULTIKEYAPPLET core/applets/multikeyappletmultikeyapplet.pro 117 CONFIG_MULTIKEYAPPLET core/applets/multikeyappletmultikeyapplet.pro
118 CONFIG_MULTIKEY inputmethods/multikeymultikey.pro 118 CONFIG_MULTIKEY inputmethods/multikeymultikey.pro
119 CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro 119 CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro
120 CONFIG_NETWORKAPPLET noncore/applets/networkappletnetworkapplet.pro 120 CONFIG_NETWORKAPPLET noncore/applets/networkappletnetworkapplet.pro
121 CONFIG_NETWORKSETUP noncore/settings/networksettingsnetworksettings.pro 121 CONFIG_NETWORKSETUP noncore/settings/networksettingsnetworksettings.pro
122 CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro 122 CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro
123 CONFIG_NS2BT noncore/settings/networksettings2/bluetoothbluetooth.pro 123 CONFIG_NS2BT noncore/settings/networksettings2/bluetoothbluetooth.pro
124 CONFIG_NS2GPRS noncore/settings/networksettings2/gprsGPRS.pro
124 CONFIG_NS2CABLE noncore/settings/networksettings2/cablecable.pro 125 CONFIG_NS2CABLE noncore/settings/networksettings2/cablecable.pro
125 CONFIG_NS2CORE noncore/settings/networksettings2/networksettings2networksettings2.pro 126 CONFIG_NS2CORE noncore/settings/networksettings2/networksettings2networksettings2.pro
127 CONFIG_NS2OPIETOOTH noncore/settings/networksettings2/opietooth2opietooth2.pro
128 CONFIG_NS2OPIETOOTHAPPLET noncore/settings/networksettings2/opietooth2_appletopietooth2_applet.pro
126 CONFIG_NS2IRDA noncore/settings/networksettings2/irdairda.pro 129 CONFIG_NS2IRDA noncore/settings/networksettings2/irdairda.pro
127 CONFIG_NS2LANCARD noncore/settings/networksettings2/lancardlancard.pro 130 CONFIG_NS2LANCARD noncore/settings/networksettings2/lancardlancard.pro
128 CONFIG_NS2MODEM noncore/settings/networksettings2/modemmodem.pro 131 CONFIG_NS2MODEM noncore/settings/networksettings2/modemmodem.pro
129 CONFIG_NS2NETWORK noncore/settings/networksettings2/networknetwork.pro 132 CONFIG_NS2NETWORK noncore/settings/networksettings2/networknetwork.pro
130 CONFIG_NS2 noncore/settings/networksettings2networksettings.pro 133 CONFIG_NS2 noncore/settings/networksettings2networksettings.pro
131 CONFIG_NS2PPP noncore/settings/networksettings2/pppppp.pro 134 CONFIG_NS2PPP noncore/settings/networksettings2/pppppp.pro
132 CONFIG_NS2PROFILE noncore/settings/networksettings2/profileprofile.pro 135 CONFIG_NS2PROFILE noncore/settings/networksettings2/profileprofile.pro
133 CONFIG_NS2USB noncore/settings/networksettings2/usbusb.pro 136 CONFIG_NS2USB noncore/settings/networksettings2/usbusb.pro
134 CONFIG_NS2VPN noncore/settings/networksettings2/vpnvpn.pro 137 CONFIG_NS2VPN noncore/settings/networksettings2/vpnvpn.pro
135 CONFIG_NS2WLAN noncore/settings/networksettings2/wlanwlan.pro 138 CONFIG_NS2WLAN noncore/settings/networksettings2/wlanwlan.pro
136 CONFIG_OAPP core/apps/oappoapp.pro 139 CONFIG_OAPP core/apps/oappoapp.pro
137 CONFIG_OBEX core/obexobex.pro 140 CONFIG_OBEX core/obexobex.pro
138 CONFIG_ODICT noncore/apps/odictodict.pro 141 CONFIG_ODICT noncore/apps/odictodict.pro
139 CONFIG_OIPKG noncore/unsupported/oipkgoipkg.pro 142 CONFIG_OIPKG noncore/unsupported/oipkgoipkg.pro
140 CONFIG_OPIEALARM core/opiealarmopiealarm.pro 143 CONFIG_OPIEALARM core/opiealarmopiealarm.pro
141 CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro 144 CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro
142 CONFIG_OPIE_EYE noncore/graphics/opie-eyephunk_view.pro 145 CONFIG_OPIE_EYE noncore/graphics/opie-eyephunk_view.pro
143 CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slaveslave.pro 146 CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slaveslave.pro
144 CONFIG_OPIEFTP noncore/net/opieftpopieftp.pro 147 CONFIG_OPIEFTP noncore/net/opieftpopieftp.pro
145 CONFIG_OPIEIRC noncore/net/opieircopieirc.pro 148 CONFIG_OPIEIRC noncore/net/opieircopieirc.pro
146 CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro 149 CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro
147 CONFIG_OPIEMAIL2noncore/unsupported/mail2 mail.pro 150 CONFIG_OPIEMAIL2noncore/unsupported/mail2 mail.pro
148 CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2opieplayer2.pro 151 CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2opieplayer2.pro
149 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro 152 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro
150 CONFIG_OPIE-RDESKTOP noncore/net/opierdesktopopierdesktop.pro 153 CONFIG_OPIE-RDESKTOP noncore/net/opierdesktopopierdesktop.pro
151 CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro 154 CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro
152 CONFIG_OPIEREC noncore/multimedia/opierecopierec.pro 155 CONFIG_OPIEREC noncore/multimedia/opierecopierec.pro
153 CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro 156 CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro
154 CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro 157 CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro
155 CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/appletapplet.pro 158 CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/appletapplet.pro
156 CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/managermanager.pro 159 CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/managermanager.pro
157 CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro 160 CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro
diff --git a/qt/control/libqte2.control b/qt/control/libqte2.control
index bcc916b..e02d0c0 100644
--- a/qt/control/libqte2.control
+++ b/qt/control/libqte2.control
@@ -1,12 +1,12 @@
1Package: libqte2 1Package: libqte2
2Files: $QTDIR/lib/libqte.so.$QTE_BASEVERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2 2Files: $QTDIR/lib/libqte.so.$QTE_BASEVERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2
3Priority: required 3Priority: required
4Section: opie/system 4Section: opie/system
5Maintainer: Robert Griebl <sandman@handhelds.org> 5Maintainer: Robert Griebl <sandman@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: 1:$QTE_VERSION-$QTE_REVISION 7Version: 1:$QTE_VERSION-$QTE_REVISION
8Depends: libjpeg62, libpng12-0, zlib1g 8Depends: libjpeg62, libpng12-0, libz1
9Provides: qt-embedded, libqt2-emb 9Provides: qt-embedded, libqt2-emb
10Replaces: qt-embedded, libqt2-emb 10Replaces: qt-embedded, libqt2-emb
11Description: Qt/Embedded environment 11Description: Qt/Embedded environment
12 A complete windowing system and GUI toolkit for handhelds. 12 A complete windowing system and GUI toolkit for handhelds.
diff --git a/scripts/tothreaded b/scripts/tothreaded
index d9f8488..31ed31e 100755
--- a/scripts/tothreaded
+++ b/scripts/tothreaded
@@ -86,47 +86,51 @@ packagename=${packagename%.control} # extension
86 86
87# 87#
88# generate new control file 88# generate new control file
89# 89#
90newcontrolfile=${controlfile/\.control/-mt\.control} 90newcontrolfile=${controlfile/\.control/-mt\.control}
91 91
92# 92#
93# read all lines in original control file 93# read all lines in original control file
94# 94#
95while read line 95while read line
96do 96do
97 case $line in 97 case $line in
98 # convert some files to threaded equivalent 98 # convert some files to threaded equivalent
99 "Files:"*) 99 "Files:"*)
100 files=${line#Files:} 100 files=${line#Files:}
101 # thread-converted files 101 # thread-converted files
102 T_files=`ConvertSpecialFiles "$files"` 102 T_files=`ConvertSpecialFiles "$files"`
103 echo "Files: $T_files" 103 echo "Files: $T_files"
104 ;; 104 ;;
105 "Package: "*) 105 "Package: "*)
106 T_package=`findthreadedequiv ${line#Package: }` 106 T_package=`findthreadedequiv ${line#Package: }`
107 echo "Package: ${T_package}" 107 echo "Package: ${T_package}"
108 ;; 108 ;;
109 "Depends: "*) 109 "Depends: "*)
110 depends=`echo "${line#Depends: }" | tokenize` 110 depends=`echo "${line#Depends: }" | tokenize`
111 T_depends=`findthreadedequiv ${depends}` 111 T_depends=`findthreadedequiv ${depends}`
112 echo "Depends: $T_depends" 112 echo "Depends: $T_depends"
113 ;; 113 ;;
114 "Provides: "*) 114 "Provides: "*)
115 T_provides=`findthreadedequiv ${line#Provides: }` 115 T_provides=`findthreadedequiv ${line#Provides: }`
116 echo "Provides: $T_provides" 116 echo "Provides: $T_provides"
117 ;; 117 ;;
118 "Recommends: "*)
119 T_recommends=`findthreadedequiv ${line#Recommends: }`
120 echo "Recommends: $T_recommends"
121 ;;
118 "Conflicts: "*) 122 "Conflicts: "*)
119 conflicts=`echo "${line#Conflicts: }" | tokenize` 123 conflicts=`echo "${line#Conflicts: }" | tokenize`
120 T_conflicts=`findthreadedequiv ${conflicts}` 124 T_conflicts=`findthreadedequiv ${conflicts}`
121 echo "Conflicts: $T_conflicts" 125 echo "Conflicts: $T_conflicts"
122 ;; 126 ;;
123 *":"*) 127 *":"*)
124 echo "$line" 128 echo "$line"
125 ;; 129 ;;
126 *) # al other lines 130 *) # al other lines
127 echo " $line" 131 echo " $line"
128 ;; 132 ;;
129 esac 133 esac
130done < $controlfile > $newcontrolfile 134done < $controlfile > $newcontrolfile
131 135
132echo $newcontrolfile 136echo $newcontrolfile