2 files changed, 41 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 95bd2ae..8429f01 100644
--- a/Makefile
+++ b/Makefile
@@ -1,60 +1,69 @@
 DISTPATH = $(shell pwd)
 DISTDIR = $(shell basename $(DISTPATH))
 
 SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
-   libkcal libkdepim kabc kabc/formats/binary kabc/plugins/file kabc/plugins/dir \
-   kabc/plugins/ldap kabc/plugins/opie \
-         korganizer kalarmd kaddressbook
+   libkcal libkdepim kabc  kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \
+   kabc/plugins/opie \
+         korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail
 all: tmake
         for i in $(SUBDIRS); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 objects:
         for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
         for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
         mkdir -p libical/lib/$(PLATFORM)
 
 clean:
         rm -f libical/lib/$(PLATFORM)/*;
         for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 install:
         cd bin/kdepim; make install
+        cp db2file/db2file $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
+        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
 
 dist:
         @echo Dont forget to do "make install" before "make dist"
         rm -f *arm.ipk
         rm -f *~
         cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
-        mkipks kdepim.control
+        mkipks kmicrokdelibs.control
+        mkipks korganizer.control
+        mkipks kaddressbook.control
+        mkipks kmicromail.control
         mkipks korganizer-alarm.control
 
 tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
+       kabc/converter/opie/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
-       kaddressbook/Makefile$(PLATFORM)
+       kaddressbook/Makefile$(PLATFORM) \
+       kmicromail/Makefile$(PLATFORM) \
+       kmicromail/libetpan/Makefile$(PLATFORM) \
+       kmicromail/libmailwrapper/Makefile$(PLATFORM) 
 
 
 
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
         cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
 
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
         cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
 
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
         cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
 
@@ -68,30 +77,42 @@ kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
 korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
         cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
 
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
         cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
 
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
         cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
 
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
         cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
 
+kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro
+        cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM)
+  
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
         cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro
         cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro
         cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro
         cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/kabc_opieE.pro
         cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_opieE.pro -o Makefile$(PLATFORM)
-        
+
+
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
         cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
 
+
+kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
+        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
+kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
+        cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
+kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
+        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
+
diff --git a/kaddressbook.control b/kaddressbook.control
new file mode 100644
index 0000000..7c44754
--- a/dev/null
+++ b/kaddressbook.control
@@ -0,0 +1,14 @@
+Files: bin/kapi  apps/Pim/kaddressbook.desktop  pics/kdepim/kaddressbook/*  
+
+Priority: optional
+Section: qpe/pim
+Maintainer: Lutz Rogowski <lutz@pi-sync.net>
+Architecture: arm
+Version: 1.9.2
+License: GPL
+Depends: lib/libmicrokde.so
+Description: KOrganizer/Pi and Kaddressbook/Pi
+ The embedded version of KOrganizer/Platform-independend, 
+    the KDE calendar and scheduling program
+  optimized for 640x480 and 320x240 resolution
+    on Zaurus PDA