12 files changed, 17 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index f9f965b..a1fc32c 100644
--- a/Makefile
+++ b/Makefile
@@ -46,13 +46,13 @@ ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.
                 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
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,7 +1,7 @@
-#
+
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
 
         MAKEFILE_GENERATOR= UNIX
diff --git a/packages b/packages
index e84184c..4002d3f 100644
--- a/packages
+++ b/packages
@@ -118,14 +118,17 @@ CONFIG_MULTIKEYAPPLET core/applets/multikeyapplet	multikeyapplet.pro
         CONFIG_MULTIKEY         inputmethods/multikeymultikey.pro
         CONFIG_NETSYSTEMTIME    noncore/settings/netsystemtimenetsystemtime.pro
         CONFIG_NETWORKAPPLET    noncore/applets/networkappletnetworkapplet.pro
         CONFIG_NETWORKSETUP     noncore/settings/networksettingsnetworksettings.pro
         CONFIG_NOTESAPPLET      noncore/applets/notesappletnotesapplet.pro
         CONFIG_NS2BT    noncore/settings/networksettings2/bluetoothbluetooth.pro
+        CONFIG_NS2GPRS  noncore/settings/networksettings2/gprsGPRS.pro
         CONFIG_NS2CABLE         noncore/settings/networksettings2/cablecable.pro
         CONFIG_NS2CORE  noncore/settings/networksettings2/networksettings2networksettings2.pro
+        CONFIG_NS2OPIETOOTH     noncore/settings/networksettings2/opietooth2opietooth2.pro
+        CONFIG_NS2OPIETOOTHAPPLET       noncore/settings/networksettings2/opietooth2_appletopietooth2_applet.pro
         CONFIG_NS2IRDA  noncore/settings/networksettings2/irdairda.pro
         CONFIG_NS2LANCARD       noncore/settings/networksettings2/lancardlancard.pro
         CONFIG_NS2MODEM         noncore/settings/networksettings2/modemmodem.pro
         CONFIG_NS2NETWORK       noncore/settings/networksettings2/networknetwork.pro
         CONFIG_NS2      noncore/settings/networksettings2networksettings.pro
         CONFIG_NS2PPP   noncore/settings/networksettings2/pppppp.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
@@ -2,11 +2,11 @@ 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
@@ -112,12 +112,16 @@ do
        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"
        ;;
      *":"*)