| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | development/keyview/opie-keyview.control | 2 | ||||
| -rw-r--r-- | development/performance/opie-performance.control | 2 | ||||
| -rw-r--r-- | etc/opie-keytabs.control | 2 | ||||
| -rw-r--r-- | examples/todayplugin/opie-today-exampleplugin.control | 2 | ||||
| -rw-r--r-- | freetype/opie-freetype.control | 2 | ||||
| -rw-r--r-- | inputmethods/handwriting/opie-handwriting-graffitiset.control | 2 | ||||
| -rw-r--r-- | libqtaux/libqtaux.control | 2 | ||||
| -rw-r--r-- | mkspecs/qws/linux-arm-g++/qmake.conf | 2 | ||||
| -rw-r--r-- | packages | 3 | ||||
| -rw-r--r-- | qt/control/libqte2.control | 2 | ||||
| -rwxr-xr-x | scripts/tothreaded | 4 |
12 files changed, 17 insertions, 10 deletions
@@ -20,65 +20,65 @@ configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPD # everything else depends on .depends, to ensure the dependencies are # intact. # # NOTE: The order in which things happen in this makefile is # -critical-. Do not rearrange this! all : $(TOPDIR)/.config # # The IPK creation is a very slow process. If you want to only create some # IPKs, e.g. the ones in library, then do # make ipks IPK_START=library # and then only the *.control files in this directory will be processed ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ prerm=`echo $${ctrl/.control/.prerm}`; \ preinst=`echo $${ctrl/.control/.preinst}`; \ postrm=`echo $${ctrl/.control/.postrm}`; \ postinst=`echo $${ctrl/.control/.postinst}`; \ echo "Building ipk of $$ctrl"; \ 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); \ done ) ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config @> $(OPIEDIR)/AllThreadedPackages @find $(OPIEDIR)/ -type f -name \*.control | grep -v -- "-mt" | while read ctrl ; do \ grep "Package[ ]*:" $${ctrl} | sed "s+Package[ ]*:[ ]*++"; \ done | sort | uniq >> $(OPIEDIR)/AllThreadedPackages @find $(OPIEDIR)/ -type f -name \*.control | while read ctrl ; do \ echo "Converting $$ctrl to -mt package"; \ nctrl=`$(OPIEDIR)/scripts/tothreaded $$ctrl $(OPIEDIR)/AllThreadedPackages`; \ echo "Building ipk of $$ctrl"; \ - [ -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); \ + [ -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); \ done @rm -f $(OPIEDIR)/AllThreadedPackages FORCE: $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs clean-configs : @echo "Wiping generated config.in files..." @-rm -f $(configs) ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),) include $(TOPDIR)/.depends.cfgs endif all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) $(call descend,scripts/kconfig,conf) @if [ ! -e $@ ]; then \ cp $(TOPDIR)/def-configs/opie $@; \ fi @$(MAKE) -C scripts/kconfig conf ./scripts/kconfig/conf -s ./config.in export ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) export 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 @@ Package: opie-keyview Files: plugins/inputmethods/libkeyview.so* Priority: optional Section: opie/inputmethods Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION +Version: $QPE_VERSION$EXTRAVERSION Depends: task-opie-minimal Description: 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 @@ Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop Priority: optional Section: opie/other Maintainer: Trolltech (www.trolltech.com) Architecture: $CPU_ARCH Arch: $DEVICE_ARCH -Version: $QPE_VERSION-10 +Version: $QPE_VERSION$EXTRAVERSION Depends: opie-taskbar Description: Graphics performance tester 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 @@ Package: opie-keytabs Files: etc/keytabs/* Priority: optional Section: opie/applications Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: 0.6-$SUB_VERSION +Version: $QPE_VERSION$EXTRAVERSION License: GPL Description: 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 @@ Package: opie-today-exampleplugin Files: plugins/today/libtodayexampleplugin.so* Priority: optional Section: opie/examples Maintainer: Maximilian Reiss <harlekin@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION +Version: $QPE_VERSION$EXTRAVERSION Depends: libqte2, opie-today Description: 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 @@ Package: opie-freetype Files: plugins/fontfactories/libfreetypefactory* Priority: optional Section: libs Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION +Version: $QPE_VERSION$EXTRAVERSION Depends: task-opie-minimal, libfreetype6 Description: 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 @@ Package: opie-handwriting-graffitiset Files: etc/qimpen/graffiti* Priority: optional Section: opie/inputmethods Maintainer: Jake Richardson <jake@asdfnews.org> Architecture: all -Version: $QPE_VERSION-$SUB_VERSION +Version: $QPE_VERSION$EXTRAVERSION Depends: task-opie-minimal Description: Graffiti character set for the Handwriting inputmethod. 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 @@ Package: libqtaux2 Files: lib/libqtaux2.so.* Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: 2.3.7-1 +Version: $QPE_VERSION$EXTRAVERSION Depends: libqte2 Provides: libqtaux Description: 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 @@ -# + # $Id$ # # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler # MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt link_prl QMAKE_CC = $(CCACHE) $(DISTCC) $(shell which arm-linux-gcc) QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CXX = $(CCACHE) $(DISTCC) $(shell which arm-linux-g++) QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD @@ -92,66 +92,69 @@ CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro CONFIG_LIBQRSYNC rsync rsync.pro CONFIG_LIBQTAUX libqtaux libqtaux.pro CONFIG_LIBSLCOMPAT libslcompat libslcompat.pro CONFIG_LIBSQL libsql libsql.pro CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro CONFIG_LIGHT-AND-POWER core/settings/light-and-power light-and-power.pro CONFIG_LIQUID noncore/styles/liquid liquid.pro CONFIG_LOCKAPPLET core/applets/lockapplet lockapplet.pro CONFIG_LOGOUTAPPLET core/applets/logoutapplet logoutapplet.pro CONFIG_MAIL3 noncore/net/mail mail.pro CONFIG_MAILAPPLET noncore/net/mail/taskbarapplet taskbarapplet.pro CONFIG_MAILIT noncore/unsupported/mailit mailit.pro CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro CONFIG_MEDIUMMOUNT noncore/settings/mediummount mediummount.pro CONFIG_MEMORYAPPLET noncore/applets/memoryapplet memoryapplet.pro CONFIG_METAL noncore/styles/metal metal.pro CONFIG_MINDBREAKER noncore/games/mindbreaker mindbreaker.pro CONFIG_MINESWEEP noncore/games/minesweep minesweep.pro CONFIG_MOBILEMSG noncore/comm/mobilemsg mobilemsg.pro CONFIG_MODPLUG core/multimedia/opieplayer/modplug modplug.pro CONFIG_MULTIAUTH_BLUEPING noncore/securityplugins/blueping bluepingplugin.pro CONFIG_MULTIAUTH_DUMMY noncore/securityplugins/dummy dummyplugin.pro CONFIG_MULTIAUTH_NOTICE noncore/securityplugins/notice noticeplugin.pro CONFIG_MULTIAUTH_PIN noncore/securityplugins/pin pinplugin.pro CONFIG_MULTIKEYAPPLET core/applets/multikeyapplet multikeyapplet.pro CONFIG_MULTIKEY inputmethods/multikey multikey.pro CONFIG_NETSYSTEMTIME noncore/settings/netsystemtime netsystemtime.pro CONFIG_NETWORKAPPLET noncore/applets/networkapplet networkapplet.pro CONFIG_NETWORKSETUP noncore/settings/networksettings networksettings.pro CONFIG_NOTESAPPLET noncore/applets/notesapplet notesapplet.pro CONFIG_NS2BT noncore/settings/networksettings2/bluetooth bluetooth.pro +CONFIG_NS2GPRS noncore/settings/networksettings2/gprs GPRS.pro CONFIG_NS2CABLE noncore/settings/networksettings2/cable cable.pro CONFIG_NS2CORE noncore/settings/networksettings2/networksettings2 networksettings2.pro +CONFIG_NS2OPIETOOTH noncore/settings/networksettings2/opietooth2 opietooth2.pro +CONFIG_NS2OPIETOOTHAPPLET noncore/settings/networksettings2/opietooth2_applet opietooth2_applet.pro CONFIG_NS2IRDA noncore/settings/networksettings2/irda irda.pro CONFIG_NS2LANCARD noncore/settings/networksettings2/lancard lancard.pro CONFIG_NS2MODEM noncore/settings/networksettings2/modem modem.pro CONFIG_NS2NETWORK noncore/settings/networksettings2/network network.pro CONFIG_NS2 noncore/settings/networksettings2 networksettings.pro CONFIG_NS2PPP noncore/settings/networksettings2/ppp ppp.pro CONFIG_NS2PROFILE noncore/settings/networksettings2/profile profile.pro CONFIG_NS2USB noncore/settings/networksettings2/usb usb.pro CONFIG_NS2VPN noncore/settings/networksettings2/vpn vpn.pro CONFIG_NS2WLAN noncore/settings/networksettings2/wlan wlan.pro CONFIG_OAPP core/apps/oapp oapp.pro CONFIG_OBEX core/obex obex.pro CONFIG_ODICT noncore/apps/odict odict.pro CONFIG_OIPKG noncore/unsupported/oipkg oipkg.pro CONFIG_OPIEALARM core/opiealarm opiealarm.pro CONFIG_OPIE-CONSOLE noncore/apps/opie-console opie-console.pro CONFIG_OPIE_EYE noncore/graphics/opie-eye phunk_view.pro CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slave slave.pro CONFIG_OPIEFTP noncore/net/opieftp opieftp.pro CONFIG_OPIEIRC noncore/net/opieirc opieirc.pro CONFIG_OPIE-LOGIN core/opie-login opie-login.pro CONFIG_OPIEMAIL2 noncore/unsupported/mail2 mail.pro CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2 opieplayer2.pro CONFIG_OPIEPLAYER core/multimedia/opieplayer opieplayer.pro CONFIG_OPIE-RDESKTOP noncore/net/opierdesktop opierdesktop.pro CONFIG_OPIE-READER noncore/apps/opie-reader opie-reader.pro CONFIG_OPIEREC noncore/multimedia/opierec opierec.pro CONFIG_OPIE-SHEET noncore/apps/opie-sheet opie-sheet.pro CONFIG_OPIE-SH noncore/tools/opie-sh opie-sh.pro CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/applet applet.pro CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/manager manager.pro CONFIG_OPIE-WRITE noncore/apps/opie-write opie-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 @@ Package: libqte2 Files: $QTDIR/lib/libqte.so.$QTE_BASEVERSION $QTDIR/lib/libqte.so.2.3 $QTDIR/lib/libqte.so.2 Priority: required Section: opie/system Maintainer: Robert Griebl <sandman@handhelds.org> Architecture: arm Version: 1:$QTE_VERSION-$QTE_REVISION -Depends: libjpeg62, libpng12-0, zlib1g +Depends: libjpeg62, libpng12-0, libz1 Provides: qt-embedded, libqt2-emb Replaces: qt-embedded, libqt2-emb Description: Qt/Embedded environment 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 # # generate new control file # newcontrolfile=${controlfile/\.control/-mt\.control} # # read all lines in original control file # while read line do case $line in # convert some files to threaded equivalent "Files:"*) files=${line#Files:} # thread-converted files T_files=`ConvertSpecialFiles "$files"` echo "Files: $T_files" ;; "Package: "*) T_package=`findthreadedequiv ${line#Package: }` echo "Package: ${T_package}" ;; "Depends: "*) depends=`echo "${line#Depends: }" | tokenize` T_depends=`findthreadedequiv ${depends}` echo "Depends: $T_depends" ;; "Provides: "*) T_provides=`findthreadedequiv ${line#Provides: }` echo "Provides: $T_provides" ;; + "Recommends: "*) + T_recommends=`findthreadedequiv ${line#Recommends: }` + echo "Recommends: $T_recommends" + ;; "Conflicts: "*) conflicts=`echo "${line#Conflicts: }" | tokenize` T_conflicts=`findthreadedequiv ${conflicts}` echo "Conflicts: $T_conflicts" ;; *":"*) echo "$line" ;; *) # al other lines echo " $line" ;; esac done < $controlfile > $newcontrolfile echo $newcontrolfile |