Merges.

4 files changed, 64 insertions, 51 deletions

diff --git a/Makefile b/Makefile
index b1e76cb..0b4a06b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,39 @@
 #!/usr/bin/make -f
 
 export TOPDIR:=$(shell pwd)
 
 include $(TOPDIR)/Vars.make
 ifneq ($(wildcard $(TOPDIR)/Vars.local),)
 include $(TOPDIR)/Vars.local
 endif
 
 noconfig_targets := xconfig menuconfig config oldconfig randconfig \
                     defconfig allyesconfig allnoconfig allmodconfig \
                     clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \
                     ipks
 
-configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in
+configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in  $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in
 
 # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
 # in order to have a full set of config.in files.
 # .depends depends on $(TOPDIR)/.config
 # 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|sed -e 's,\.control$$,.prerm,'`; \
                 preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \
                 postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \
                 postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \
                 echo "Building ipk of $$ctrl"; \
@@ -41,96 +41,69 @@ ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.con
                 done )
 
 $(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
 
-# config rules must have the $(configs) var defined
-# at the time that they run. we must ensure that .depends.cfgs
-# is built and included by the time we reach this point.
-
-xconfig :
-        $(call descend,scripts/kconfig,qconf)
-        LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
-                ./scripts/kconfig/qconf ./config.in
-
-menuconfig : $(TOPDIR)/scripts/lxdialog/lxdialog
-        $(call descend,scripts/kconfig,mconf)
-        ./scripts/kconfig/mconf ./config.in
-
-config :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf ./config.in
- 
-oldconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -o ./config.in
- 
-randconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -r ./config.in
- 
-allyesconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -y ./config.in
- 
-allnoconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -n ./config.in
- 
-defconfig :
-        $(call descend,scripts/kconfig,conf)
-        ./scripts/kconfig/conf -d ./config.in
-
-
 export
 
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
 export include-config := 1
 
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/.depends
 endif
 
 -include $(TOPDIR)/.config.cmd
 
 SUBDIRS = $(subdir-y)
 
 all clean install ipk: $(SUBDIRS)
 
 lupdate lrelease:
         @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
-opie-lupdate opie-lrelease:
-        @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
+opie-lupdate opie-lrelease messages:
+        @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done;
+
+# from kde 
+qtmessages:
+        cd $(QTDIR)/src ; \
+        sed -e "s,#define,," xml/qxml.cpp > qxml_clean.cpp ;\
+        find . -name "*.cpp" | grep -v moc_ > list ;\
+        for file in qfiledialog qcolordialog qprintdialog \
+                qurloperator qftp qhttp qlocal qerrormessage; do \
+                grep -v $$file list > list.new && mv list.new list ;\
+        done ;\
+        xgettext -C -ktr -kQT_TRANSLATE_NOOP -n `cat list` -o $(OPIEDIR)/qt-messages.pot 
 
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \
         $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \
         $(TOPDIR)/library/custom.h
 
 clean : $(TOPDIR)/.config
         make -C bin clean
         make -C lib clean
         make -C plugins clean
 
 apidox : doc/generate_apidox 
 
 include $(TOPDIR)/Rules.make
diff --git a/Rules.make b/Rules.make
index e673eac..d26e42a 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,25 +1,26 @@
-.PHONY: FORCE
+.phony: force
+force:
 
 $(configs) :
         $(call makecfg,$@)
 
 $(TOPDIR)/gen.pro : $(TOPDIR)/.config
         echo > $@
 ifneq ($(CONFIG_DEBUG),)
         echo CONFIG += debug >> $@
         echo CONFIG -= release >> $@
 else
         echo CONFIG -= debug >> $@
         echo CONFIG += release >> $@
 endif
 ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
         echo CONFIG -= qt3 >> $@
 else
         echo CONFIG += qt3 >> $@
 endif
 
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
         @echo Generating dependency information...
 # add to subdir-y, and add descend rules
         @cat $(TOPDIR)/packages | grep -v '^#' | \
                 awk '{print \
@@ -36,117 +37,154 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
 $(TOPDIR)/.depends.cfgs:
 # config.in interdependencies
         @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
         @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
         @-rm -f dirs
 
 $(QTDIR)/stamp-headers :
         @-rm -f $(QTDIR)/stamp-headers*
         ( cd $(QTDIR)/include; \
                 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
                 qcopchannel_qws.h qwindowsystem_qws.h \
                 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
         touch $@
 
 $(QTDIR)/stamp-headers-x11 :
         @-rm -f $(QTDIR)/stamp-headers*
         cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
         touch $@
 
 $(OPIEDIR)/stamp-headers :
         @-rm -f $(OPIEDIR)/stamp-headers*
         mkdir -p $(TOPDIR)/include/qpe \
                  $(TOPDIR)/include/qtopia \
                  $(TOPDIR)/include/opie \
-                 $(TOPDIR)/include/qtopia/private \
-                 $(TOPDIR)/include/opie2
+                 $(TOPDIR)/include/qtopia/private 
         ( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
         ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
         ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
         ( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
-        ( cd include/opie &&  ln -sf ../../libsql/*.h .; )
         ( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
         #( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
         #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
         ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
         ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
         touch $@
         
 $(OPIEDIR)/stamp-headers-x11 :
         @-rm -f $(OPIEDIR)/stamp-headers*
         mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
                 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
         ( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
         ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
         ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
         ( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
         ( cd include/opie &&  ln -sf ../../libsql/*.h .; )
         ( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
         ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
         ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
         ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
         touch $@
         
 $(TOPDIR)/library/custom.h : $(TOPDIR)/.config
         @-rm -f $@
         @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
                 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
         @touch $@
 
-$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake :
-        $(call descend,$(shell dirname $@),$(shell basename $@))
+$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake:
+        @$(call descend,$(shell dirname $@),$(shell basename $@))
+
+menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
+        $(TOPDIR)/scripts/kconfig/mconf ./config.in
+        @touch ./.config.stamp
+
+xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
+        $(TOPDIR)/scripts/kconfig/qconf ./config.in
+        @touch .config.stamp
+
+gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
+        $(TOPDIR)/scripts/kconfig/gconf ./config.in
+        @touch .config.stamp
+
+config: $(TOPDIR)/scripts/kconfig/conf ./config.in
+        $(TOPDIR)/scripts/kconfig/conf ./config.in
+        @touch .config.stamp
+ 
+oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
+        $(TOPDIR)/scripts/kconfig/conf -o ./config.in
+        @touch .config.stamp
+ 
+randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
+        $(TOPDIR)/scripts/kconfig/conf -r ./config.in
+        @touch .config.stamp
+ 
+allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
+        $(TOPDIR)/scripts/kconfig/conf -y ./config.in
+        @touch .config.stamp
+ 
+allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
+        $(TOPDIR)/scripts/kconfig/conf -n ./config.in
+        @touch .config.stamp
+ 
+defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
+        $(TOPDIR)/scripts/kconfig/conf -d ./config.in
+        @touch .config.stamp
 
 $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
 
 $(TOPDIR)/mkspecs/default :
         ln -sf linux-g++ $@
 
-$(TOPDIR)/scripts/subst : FORCE
+$(TOPDIR)/scripts/subst : force
         @( \
                 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
                 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
                 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
                 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
                 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
+                echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
                 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
         ) > $@ || ( rm -f $@; exit 1 )
 
-$(TOPDIR)/scripts/filesubst : FORCE
+$(TOPDIR)/scripts/filesubst : force
         @( \
                 echo 's,\$$OPIEDIR/root/,/,g'; \
                 echo 's,$(OPIEDIR)/root/,/,g'; \
                 echo 's,\$$OPIEDIR,$(prefix),g'; \
                 echo 's,$(OPIEDIR),$(prefix),g'; \
                 echo 's,\$$QTDIR,$(prefix),g'; \
                 echo 's,$(QTDIR),$(prefix),g'; \
                 echo 's,^\(\./\)*root/,/,g'; \
                 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
                 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
                 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
                 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
                 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
                 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
                 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
                 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
                 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \
+                echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
+                echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \
         ) > $@ || ( rm -f $@; exit 1 )
 
 ## general rules ##
 
 define descend
         $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
 endef
 
 define makefilegen
                 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep "  \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \
                 head -1 | awk '{print $$3}'`
 endef
 
 define makecfg
         $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
 endef
diff --git a/Vars.make b/Vars.make
index cc463d3..59766d1 100644
--- a/Vars.make
+++ b/Vars.make
@@ -34,48 +34,52 @@ endif
 export QMAKE:=$(OPIEDIR)/qmake/qmake
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 
 ifeq ($(QPE_VERSION),)
     VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
     VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
     VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
     QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
 
     ifeq ($(QPE_VERSION),..)
         QPE_VERSION=0.9.3
     endif
 endif
 export QPE_VERSION
 
 SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
 ifeq ($(VERSION_CVS),)
     VERSION_CVS:=$(shell date +%Y%m%d)
 endif
 ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
     SUB_VERSION:=$(VERSION_CVS)
 endif
 export SUB_VERSION
 
+ifneq ($(strip $(SUB_VERSION)),)
+EXTRAVERSION=-$(SUB_VERSION)
+endif
+
 ifeq ($(QTE_REVISION),)
     QTE_REVISION=5
 endif
 export QTE_REVISION
 
 export DEB_VERSION=2.0
 
 ifeq ($(QTE_BASEVERSION),)
     ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
         QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
     else
         QTE_BASEVERSION=2.3.5
     endif
 endif
 export QTE_BASEVERSION
 
 ifeq ($(QTE_VERSION),)
     ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
         QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
     else
         QTE_VERSION=2.3.5
     endif
 endif
 export QTE_VERSION
diff --git a/packages b/packages
index 71ae4ef..cda9591 100644
--- a/packages
+++ b/packages
@@ -74,51 +74,49 @@ CONFIG_LIBOPIE2MM	libopie2/opiemm	opiemm.pro
         CONFIG_LIBOPIETOOTH     noncore/net/opietooth/liblib.pro
         CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
         CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
         CONFIG_LIBSQL   libsqllibsql.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-powerlight-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
         CONFIG_MAILIT           noncore/net/mailit      mailit.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
         CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
         CONFIG_MOBILEMSG        noncore/comm/mobilemsgmobilemsg.pro
         CONFIG_MODPLUG  core/multimedia/opieplayer/modplugmodplug.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_OAPP     core/apps/oappoapp.pro
         CONFIG_OBEX     core/applets/obex2obex.pro
-        CONFIG_OCOPSERVER       x11/ipc/serverocopserver.pro
         CONFIG_ODICT    noncore/apps/odictodict.pro
-        CONFIG_OFILESELECTOR    libopie/ofileselectorofileselector.pro
         CONFIG_OIPKG    core/apps/oipkgoipkg.pro
         CONFIG_OPIE-CONSOLE     noncore/apps/opie-consoleopie-console.pro
         CONFIG_OPIE-LOGIN       core/opie-loginopie-login.pro
         CONFIG_OPIE-READER      noncore/apps/opie-readeropie-reader.pro
         CONFIG_OPIE-SH  noncore/tools/opie-shopie-sh.pro
         CONFIG_OPIE-SHEET       noncore/apps/opie-sheetopie-sheet.pro
         CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
         CONFIG_OPIEALARMcore/opiealarm
         CONFIG_OPIEFTP  noncore/net/opieftpopieftp.pro
         CONFIG_OPIEIRC  noncore/net/opieircopieirc.pro
         CONFIG_OPIEMAIL2noncore/mail mail.pro
         CONFIG_OPIEPLAYER       core/multimedia/opieplayeropieplayer.pro
         CONFIG_OPIEPLAYER2      noncore/multimedia/opieplayer2opieplayer2.pro
         CONFIG_OPIEREC          noncore/multimedia/opierecopierec.pro
         CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro
         CONFIG_OPIETOOTH-MANAGER        noncore/net/opietooth/managermanager.pro
         CONFIG_OSEARCH  core/pim/osearchosearch.pro
         CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
         CONFIG_PARASHOOT        noncore/games/parashootparashoot.pro
         CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
         CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
         CONFIG_QPDF     noncore/graphics/qpdfqpdf.pro
         CONFIG_QUICKEXEC        quickexecquickexec.pro