adapt to directory structure changes done on cvs server

3 files changed, 11 insertions, 12 deletions

diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
index eafabce..cd3f4a5 100644
--- a/noncore/applets/memoryapplet/memoryapplet.pro
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -1,20 +1,20 @@
 TEMPLATE    = lib
 CONFIG      += qt plugin warn_on release
-HEADERS     = ../../apps/sysinfo/graph.h \
-            ../../apps/sysinfo/load.h  \
-            ../../apps/sysinfo/memory.h  \
+HEADERS     = ../../settings/sysinfo/graph.h \
+            ../../settings/sysinfo/load.h  \
+            ../../settings/sysinfo/memory.h  \
             memoryappletimpl.h  \
             memorymeter.h  \
             memorystatus.h \
             swapfile.h
-SOURCES     = ../../apps/sysinfo/graph.cpp \
-            ../../apps/sysinfo/load.cpp \
-            ../../apps/sysinfo/memory.cpp \
+SOURCES     = ../../settings/sysinfo/graph.cpp \
+            ../../settings/sysinfo/load.cpp \
+            ../../settings/sysinfo/memory.cpp \
             memoryappletimpl.cpp  \
             memorymeter.cpp \
             memorystatus.cpp \
             swapfile.cpp
 TARGET      = memoryapplet
 DESTDIR     = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += ../$(OPIEDIR)/include
diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp
index a800fa5..b738312 100644
--- a/noncore/applets/memoryapplet/memorystatus.cpp
+++ b/noncore/applets/memoryapplet/memorystatus.cpp
@@ -13,17 +13,17 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "memorystatus.h"
-#include "../../apps/sysinfo/memory.h"
+#include "../../settings/sysinfo/memory.h"
 #include "swapfile.h"
 
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qdrawutil.h>
 #include <qlabel.h>
 
 #include <opie/otabwidget.h>
diff --git a/packages b/packages
index 53f6c09..d570e85 100644
--- a/packages
+++ b/packages
@@ -1,13 +1,13 @@
 CONFIG_ADDRESSBOOK	core/pim/addressbook	addressbook.pro
 CONFIG_ADVANCEDFM	noncore/apps/advancedfm	advancedfm.pro
 CONFIG_APPEARANCE2	noncore/settings/appearance2	appearance2.pro
 CONFIG_APPSKEY	noncore/settings/appskey	appskey.pro
-CONFIG_AQPKG	noncore/apps/aqpkg	aqpkg.pro
+CONFIG_AQPKG	noncore/settings/aqpkg	aqpkg.pro
 CONFIG_BACKGAMMON	noncore/games/backgammon backgammon.pro
 CONFIG_BACKUP	noncore/settings/backup	backup.pro
 CONFIG_BATTERYAPPLET	core/applets/batteryapplet	batteryapplet.pro
 CONFIG_BEND	noncore/mail/bend	bend.pro
 CONFIG_BINARY	noncore/tools/calc2/binary	binary.pro
 CONFIG_BLUE-PIN	noncore/net/opietooth/blue-pin	blue-pin.pro
 CONFIG_BOUNCE	noncore/games/bounce	bounce.pro
 CONFIG_BUTTON-SETTINGS	core/settings/button	button.pro
@@ -30,17 +30,17 @@ CONFIG_DECO_LIQUID	noncore/decorations/liquid	liquid.pro
 CONFIG_DECO_POLISHED	noncore/decorations/polished	polished.pro
 CONFIG_DICTIONARY	noncore/apps/dictionary	dictionary.pro
 CONFIG_DOCTAB  noncore/settings/doctab doctab.pro
 CONFIG_DRAWPAD	noncore/graphics/drawpad	drawpad.pro
 CONFIG_DVORAK	inputmethods/dvorak	dvorak.pro
 CONFIG_EMBEDDEDKONSOLE	core/apps/embeddedkonsole	embeddedkonsole.pro
 CONFIG_EUROCONV		noncore/tools/euroconv/ euroconv.pro
 CONFIG_FIFTEEN	noncore/games/fifteen	fifteen.pro
-CONFIG_FILEBROWSER	core/apps/filebrowser	filebrowser.pro
+CONFIG_FILEBROWSER	noncore/unsupported/filebrowser	filebrowser.pro
 CONFIG_FLAT	noncore/styles/flat	flat.pro
 CONFIG_FORMATTER	noncore/tools/formatter	formatter.pro
 CONFIG_FREETYPE	freetype	freetype.pro
 CONFIG_FRESH	noncore/styles/fresh	fresh.pro
 CONFIG_FTPLIB	noncore/net/ftplib	ftplib.pro
 CONFIG_GO	noncore/games/go	go.pro
 CONFIG_GSMTOOL	noncore/comm/gsmtool	gsmtool.pro
 CONFIG_HANDWRITING	inputmethods/handwriting	handwriting.pro
@@ -119,18 +119,17 @@ CONFIG_OPIETOOTH-APPLET	noncore/net/opietooth/applet	applet.pro
 CONFIG_OPIETOOTH-MANAGER	noncore/net/opietooth/manager	manager.pro
 CONFIG_OSEARCH	core/pim/osearch	osearch.pro
 CONFIG_OXYGEN	noncore/apps/oxygen	oxygen.pro
 CONFIG_PARASHOOT	noncore/games/parashoot	parashoot.pro
 CONFIG_PICKBOARD	inputmethods/pickboard	pickboard.pro
 CONFIG_QASTEROIDS	noncore/games/qasteroids	qasteroids.pro
 CONFIG_QASHMONEY	noncore/apps/qashmoney	qashmoney.pro
 CONFIG_QCOP	core/apps/qcop	qcop.pro
-CONFIG_QPDF	noncore/graphics/qpdf	qpdf.pro
-CONFIG_QPDF2	noncore/graphics/qpdf2	qpdf2.pro
+CONFIG_QPDF	noncore/unsupported/qpdf	qpdf.pro
 CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
 CONFIG_QWS	core/qws	qws.pro
 CONFIG_REMOTE	noncore/tools/remote	remote.pro
 CONFIG_RESTARTAPPLET	core/applets/restartapplet	restartapplet.pro
 CONFIG_RESTARTAPPLET2	core/applets/restartapplet2	restartapplet2.pro
 CONFIG_ROTATEAPPLET	core/applets/rotateapplet	rotateapplet.pro
 CONFIG_ROTATION	noncore/settings/rotation	rotation.pro
 CONFIG_RUNAPPLET	core/applets/runapplet	runapplet.pro
@@ -141,17 +140,17 @@ CONFIG_SFCAVE-SDL	noncore/games/sfcave-sdl	sfcave-sdl.pro
 CONFIG_SHOWIMG	noncore/multimedia/showimg	showimg.pro
 CONFIG_SIMPLE	noncore/tools/calc2/simple	simple.pro
 CONFIG_SINGLE	single	single.pro
 CONFIG_SNAKE	noncore/games/snake	snake.pro
 CONFIG_SOLITAIRE	noncore/games/solitaire	solitaire.pro
 CONFIG_SOUND	noncore/settings/sound	sound.pro
 CONFIG_SSHKEYS	noncore/settings/sshkeys	sshkeys.pro
 CONFIG_SUSPENDAPPLET	core/applets/suspendapplet	suspendapplet.pro
-CONFIG_SYSINFO	noncore/apps/sysinfo	sysinfo.pro
+CONFIG_SYSINFO	noncore/settings/sysinfo	sysinfo.pro
 CONFIG_TABLEVIEWER	noncore/apps/tableviewer	tableviewer.pro
 CONFIG_TABMANAGER	noncore/settings/tabmanager	tabmanager.pro
 CONFIG_TABOAPP	core/apps/taboapp	taboapp.pro
 CONFIG_TEST	libsql/test	test.pro
 CONFIG_TEST	noncore/apps/opie-console/test	test.pro
 CONFIG_TETRIX	noncore/games/tetrix	tetrix.pro
 CONFIG_TEXTEDIT	core/apps/textedit	textedit.pro
 CONFIG_THEME	noncore/styles/theme	theme.pro