8 files changed, 47 insertions, 30 deletions

diff --git a/libopie2/opiecore/device/.cvsignore b/libopie2/opiecore/device/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/opiecore/device/.cvsignore
@@ -0,0 +1,6 @@
+Makefile*
+moc*
+*moc
+*.o
+~*
+
diff --git a/libopie2/opiecore/device/device.pro b/libopie2/opiecore/device/device.pro
new file mode 100644
index 0000000..946bff1
--- a/dev/null
+++ b/libopie2/opiecore/device/device.pro
@@ -0,0 +1,19 @@
+HEADERS    += device/odevice.h          \
+              device/odevicebutton.h    \
+              device/odevice_ipaq.h     \
+              device/odevice_jornada.h  \
+              device/odevice_ramses.h   \
+              device/odevice_simpad.h   \
+              device/odevice_zaurus.h   \
+              device/odevice_yopy.h     \
+
+SOURCES    += device/odevice.cpp        \
+              device/odevicebutton.cpp  \
+              device/odevice_ipaq.cpp   \
+              device/odevice_jornada.cpp\
+              device/odevice_ramses.cpp \
+              device/odevice_simpad.cpp \
+              device/odevice_zaurus.cpp \
+              device/odevice_yopy.cpp   \
+
+              
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control
index f0a3afc..4679f28 100644
--- a/libopie2/opiecore/libopiecore2.control
+++ b/libopie2/opiecore/libopiecore2.control
@@ -6,3 +6,3 @@ Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.3-$SUB_VERSION.2
+Version: 1.8.5-$SUB_VERSION.1
 Depends: libqpe1
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index 98d315f..7a75a02 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -6,10 +6,2 @@ HEADERS     = oapplication.h            \
               odebug.h                  \
-              odevice.h                 \
-              odevicebutton.h           \
-              odevice_ipaq.h            \
-              odevice_jornada.h         \
-              odevice_ramses.h          \
-              odevice_simpad.h          \
-              odevice_zaurus.h          \
-              odevice_yopy.h            \
               oglobal.h                 \
@@ -23,10 +15,2 @@ SOURCES     = oapplication.cpp          \
               odebug.cpp                \
-              odevice.cpp               \
-              odevicebutton.cpp         \
-              odevice_ipaq.cpp          \
-              odevice_jornada.cpp       \
-              odevice_ramses.cpp        \
-              odevice_simpad.cpp        \
-              odevice_zaurus.cpp        \
-              odevice_yopy.cpp          \
               oglobal.cpp               \
@@ -37,10 +21,9 @@ SOURCES     = oapplication.cpp          \
 
+include ( device/device.pro )
+
 INTERFACES  =
 TARGET      = opiecore2
-VERSION     = 1.8.3
+VERSION     = 1.8.5
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-MOC_DIR     = moc
-OBJECTS_DIR = obj
-
 
diff --git a/libopie2/opieui/fileselector/.cvsignore b/libopie2/opieui/fileselector/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/opieui/fileselector/.cvsignore
@@ -0,0 +1,6 @@
+Makefile*
+moc*
+*moc
+*.o
+~*
+
diff --git a/libopie2/opieui/fileselector/fileselector.pro b/libopie2/opieui/fileselector/fileselector.pro
new file mode 100644
index 0000000..cbbd588
--- a/dev/null
+++ b/libopie2/opieui/fileselector/fileselector.pro
@@ -0,0 +1,8 @@
+HEADERS    += fileselector/ofileselector.h        \
+              fileselector/ofileselector_p.h      \
+              fileselector/ofiledialog.h          \
+              fileselector/ofileview.h            \
+
+SOURCES    += fileselector/ofileselector.cpp      \
+              fileselector/ofiledialog.cpp        \
+
diff --git a/libopie2/opieui/libopieui2.control b/libopie2/opieui/libopieui2.control
index 71e6358..6f61f53 100644
--- a/libopie2/opieui/libopieui2.control
+++ b/libopie2/opieui/libopieui2.control
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.2-$SUB_VERSION.2
-Depends: libqpe1, libopiecore2 (1.8.2)
+Version: 1.8.5-$SUB_VERSION.1
+Depends: libqpe1, libopiecore2 (1.8.5)
 Provides: libopieui2
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index b07976b..8b8ed21 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -6,6 +6,2 @@ HEADERS     = ocheckitem.h           \
               odialog.h              \
-              ofileselector.h        \
-              ofileselector_p.h      \
-              ofiledialog.h          \
-              ofileview.h            \
               ofontselector.h        \
@@ -30,4 +26,2 @@ SOURCES     = ocheckitem.cpp         \
               oclickablelabel.cpp    \
-              ofileselector.cpp      \
-              ofiledialog.cpp        \
               ofontselector.cpp      \
@@ -50,2 +44,3 @@ SOURCES     = ocheckitem.cpp         \
 include ( big-screen/big-screen.pro )
+include ( fileselector/fileselector.pro )
 
@@ -54,3 +49,3 @@ INTERFACES  = otimepickerbase.ui
 TARGET      = opieui2
-VERSION     = 1.8.4
+VERSION     = 1.8.5