summaryrefslogtreecommitdiff
Unidiff
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
@@ -49,7 +49,7 @@ ipks-mt: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.
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
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
@@ -4,6 +4,6 @@ Priority: 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
@@ -4,7 +4,7 @@ Section: 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
@@ -4,6 +4,6 @@ Priority: 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
@@ -4,6 +4,6 @@ Priority: 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
@@ -4,6 +4,6 @@ Priority: 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
@@ -4,7 +4,7 @@ Priority: 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
@@ -4,7 +4,7 @@ Priority: 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,4 +1,4 @@
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
diff --git a/packages b/packages
index e84184c..4002d3f 100644
--- a/packages
+++ b/packages
@@ -121,8 +121,11 @@ CONFIG_NETWORKAPPLET noncore/applets/networkapplet networkapplet.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
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
@@ -5,7 +5,7 @@ Section: 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
diff --git a/scripts/tothreaded b/scripts/tothreaded
index d9f8488..31ed31e 100755
--- a/scripts/tothreaded
+++ b/scripts/tothreaded
@@ -115,6 +115,10 @@ do
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}`