Merges.

4 files changed, 64 insertions, 51 deletions

diff --git a/Makefile b/Makefile
index b1e76cb..0b4a06b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ noconfig_targets := xconfig menuconfig config oldconfig randconfig \
 		    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.
@@ -62,44 +62,6 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
 	@$(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)),)
@@ -119,8 +81,19 @@ 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 ) \
diff --git a/Rules.make b/Rules.make
index e673eac..d26e42a 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,4 +1,5 @@
-.PHONY: FORCE
+.phony: force
+force:
 
 $(configs) :
 	$(call makecfg,$@)
@@ -57,13 +58,11 @@ $(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 .; )
@@ -98,25 +97,62 @@ $(TOPDIR)/library/custom.h : $(TOPDIR)/.config
 		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'; \
@@ -134,6 +170,8 @@ $(TOPDIR)/scripts/filesubst : FORCE
 		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 ##
diff --git a/Vars.make b/Vars.make
index cc463d3..59766d1 100644
--- a/Vars.make
+++ b/Vars.make
@@ -55,6 +55,10 @@ ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VER
 endif
 export SUB_VERSION
 
+ifneq ($(strip $(SUB_VERSION)),)
+EXTRAVERSION=-$(SUB_VERSION)
+endif
+
 ifeq ($(QTE_REVISION),)
     QTE_REVISION=5
 endif
diff --git a/packages b/packages
index 71ae4ef..cda9591 100644
--- a/packages
+++ b/packages
@@ -95,9 +95,7 @@ CONFIG_NETWORKSETUP	noncore/settings/networksettings	networksettings.pro
 CONFIG_NOTESAPPLET	noncore/applets/notesapplet	notesapplet.pro
 CONFIG_OAPP	core/apps/oapp	oapp.pro
 CONFIG_OBEX	core/applets/obex2	obex.pro
-CONFIG_OCOPSERVER	x11/ipc/server	ocopserver.pro
 CONFIG_ODICT	noncore/apps/odict	odict.pro
-CONFIG_OFILESELECTOR	libopie/ofileselector	ofileselector.pro
 CONFIG_OIPKG	core/apps/oipkg	oipkg.pro
 CONFIG_OPIE-CONSOLE	noncore/apps/opie-console	opie-console.pro
 CONFIG_OPIE-LOGIN	core/opie-login	opie-login.pro