summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--gammu/emb/common/commonE.pro2
-rw-r--r--gammu/emb/gammu/gammuE.pro2
-rw-r--r--kabc/formats/binary/kabcformat_binaryE.pro2
-rw-r--r--kabc/plugins/dir/dirE.pro2
-rw-r--r--kabc/plugins/file/fileE.pro2
-rw-r--r--kabc/plugins/opie/opieE.pro2
-rw-r--r--kabc/plugins/qtopia/qtopiaE.pro2
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmE.pro3
-rw-r--r--kaddressbook/kaddressbookE.pro3
-rw-r--r--kmicrokdelibs.control1
-rw-r--r--kmicromail/kmicromailE.pro2
-rw-r--r--kmobilephoneaccess.control3
-rw-r--r--kopiemail.control1
-rw-r--r--korganizer.control1
-rw-r--r--korganizer/korganizerE.pro3
-rw-r--r--ksharpPIM-DTMaccess.control3
-rw-r--r--pimTABicon.control2
-rw-r--r--pwmanager.control2
18 files changed, 14 insertions, 24 deletions
diff --git a/gammu/emb/common/commonE.pro b/gammu/emb/common/commonE.pro
index 1512814..0133835 100644
--- a/gammu/emb/common/commonE.pro
+++ b/gammu/emb/common/commonE.pro
@@ -169,13 +169,13 @@ phone/nokia/dct4/dct4func.c \
phone/nokia/nauto.c \
phone/nokia/nfunc.c \
phone/nokia/nfuncold.c \
phone/obex/obexgen.c \
phone/symbian/mroutgen.c
-TARGET = kammu
+TARGET = microkammu
DESTDIR = $(QPEDIR)/lib
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
CONFIG = warn_off release console
diff --git a/gammu/emb/gammu/gammuE.pro b/gammu/emb/gammu/gammuE.pro
index 5b18205..b0c610b 100644
--- a/gammu/emb/gammu/gammuE.pro
+++ b/gammu/emb/gammu/gammuE.pro
@@ -44,13 +44,13 @@ SOURCES += gammu.c \
depend/nokia/dct3trac/wmx-list.c \
depend/nokia/dct3trac/wmx-sim.c \
depend/nokia/dct3trac/wmx-util.c \
depend/nokia/dct3trac/wmx.c
LIBS += -L$(QPEDIR)/lib
-LIBS += -lkammu
+LIBS += -lmicrokammu
#LIBS += -lbluetooth
#LIBS += -lsdp
LIBS += -lpthread
CONFIG = warn_off release console
DESTDIR=$(QPEDIR)/bin
OBJECTS_DIR = obj/$(PLATFORM)
diff --git a/kabc/formats/binary/kabcformat_binaryE.pro b/kabc/formats/binary/kabcformat_binaryE.pro
index 6d300eb..2d9594d 100644
--- a/kabc/formats/binary/kabcformat_binaryE.pro
+++ b/kabc/formats/binary/kabcformat_binaryE.pro
@@ -5,13 +5,13 @@ CONFIG += qt warn_on release
TARGET = microkabcformat_binary
#INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat
INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../qtcompat
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
LIBS += -L$(QPEDIR)/lib
DEFINES += KAB_EMBEDDED
INTERFACES = \
HEADERS = \
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index 3c5e87f..cda4e2f 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -4,13 +4,13 @@ CONFIG += qt warn_on release
TARGET = microkabc_dir
INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
LIBS += -L$(QPEDIR)/lib
INTERFACES = \
HEADERS = \
resourcedir.h \
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 438076e..16707e5 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -4,13 +4,13 @@ CONFIG += qt warn_on release
TARGET = microkabc_file
INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
LIBS += -L$(QPEDIR)/lib
INTERFACES = \
HEADERS = \
resourcefile.h \
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index c506477..b7ecbc0 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -7,13 +7,13 @@ INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kde
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
LIBS += -lmicrokde
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
LIBS += -L$(QPEDIR)/lib
LIBS += -L$(OPIEDIR)/lib
LIBS += -lopie
LIBS += -lqpe
LIBS += -lqte
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index d66c719..700057b 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -6,13 +6,13 @@ TARGET = microkabc_qtopia
INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
LIBS += -lmicrokde
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
LIBS += -L$(QPEDIR)/lib
LIBS += -lqpe
INTERFACES = \
HEADERS = \
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 46fe417..23b0b76 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -6,16 +6,15 @@ INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
LIBS += -lmicrokde
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
LIBS += -lmicrokdepim
LIBS += -lmicroqtcompat
-#LIBS += -lmicrokcal
LIBS += -L$(QPEDIR)/lib
LIBS += -ljpeg
LIBS += -lqpe
LIBS += -lqte
LIBS += -lzdtm
LIBS += -lsl
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 7400251..64e3a4a 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -10,16 +10,15 @@ DESTDIR=$(QPEDIR)/bin
INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
#DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
#DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
#DEFINES += KORG_NOLVALTERNATION
LIBS += -lmicrokdepim
-#LIBS += -lmicrokcal
LIBS += -lmicrokde
LIBS += -lmicroqtcompat
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
LIBS += -lqpe
LIBS += -ljpeg
LIBS += $(QTOPIALIB)
LIBS += -L$(QPEDIR)/lib
LIBS += -Wl,-export-dynamic
LIBS += $(GCC3EXTRALIB1)
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index a8b3f9a..9e05623 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,8 +1,7 @@
Files: lib/libmicroqt* lib/libmicrokde* pics/kdepim/LICENCE.TXT pics/kdepim/SyncHowto.txt pics/kdepim/WhatsNew.txt pics/kdepim/Zaurus-KDE_syncHowTo.txt
-
Priority: optional
Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index d578a9c..07cd2d8 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -52,13 +52,13 @@ INTERFACES = editaccountsui.ui \
newmaildirui.ui \
selectstoreui.ui \
nntpgroupsui.ui
INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
-LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicroqtcompat -lmicrokdepim
+LIBS += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim
LIBS += $(QTOPIALIB)
#LIBS += -lqtopia
#next line for Zaurus only
#LIBS += -luuid
LIBS += $(GCC3EXTRALIB1)
diff --git a/kmobilephoneaccess.control b/kmobilephoneaccess.control
index 07559e7..be4a4c2 100644
--- a/kmobilephoneaccess.control
+++ b/kmobilephoneaccess.control
@@ -1,11 +1,10 @@
-Files: bin/kammu lib/libkammu*
+Files: bin/kammu lib/libmicrokammu*
Priority: optional
Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
-Depends:
Description: Special version of gammu / libgammu
for Zaurus PDA and microkde
diff --git a/kopiemail.control b/kopiemail.control
index 58d4bfa..77e0e79 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,8 +1,7 @@
Files: bin/ompi apps/Pim/kopiemail.desktop pics/kdepim/kopiemail/* lib/libmicromail* lib/libmicrolibetpan*
-
Priority: optional
Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
diff --git a/korganizer.control b/korganizer.control
index 2910ebd..0224cc3 100644
--- a/korganizer.control
+++ b/korganizer.control
@@ -1,8 +1,7 @@
Files: bin/kopi apps/Pim/korganizer.desktop pics/kdepim/korganizer/* lib/libmicrokcal*
-
Priority: optional
Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 5cf9778..e6c3f8d 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -9,16 +9,15 @@ INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore
DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
DEFINES += KORG_NOLVALTERNATION
#KORG_NOKABC
LIBS += -lmicrokdepim
-LIBS += -lkomicrokcal
+LIBS += -lmicrokcal
LIBS += -lmicrokde
LIBS += -lmicroqtcompat
-#LIBS += -lmicrokabc
LIBS += $(GCC3EXTRALIB1)
LIBS += $(GCC3EXTRALIB2)
LIBS += -lqpe
diff --git a/ksharpPIM-DTMaccess.control b/ksharpPIM-DTMaccess.control
index f735462..545bce4 100644
--- a/ksharpPIM-DTMaccess.control
+++ b/ksharpPIM-DTMaccess.control
@@ -1,8 +1,7 @@
-Files: bin/db2file libmicrokabc_sharp*
-
+Files: bin/db2file lib/libmicrokabc_sharp*
Priority: optional
Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
diff --git a/pimTABicon.control b/pimTABicon.control
index 46458d1..0007c7c 100644
--- a/pimTABicon.control
+++ b/pimTABicon.control
@@ -1,11 +1,9 @@
Files: apps/Pim/.directory pics/ko24ti.png
-
Priority: optional
Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
-Depends:
Description: Icon for Pim TAB
for Zaurus PDA and microkde
diff --git a/pwmanager.control b/pwmanager.control
index 3ea90ce..d346544 100644
--- a/pwmanager.control
+++ b/pwmanager.control
@@ -3,12 +3,12 @@ Files: bin/pwmpi apps/Pim/pwmanager.desktop pics/kdepim/pwmanager/*
Priority: optional
Section: qpe/pim
Maintainer: Ulf Schenk
Architecture: arm
Version: $KDEPIM_VERSION
License: GPL
-Depends:
+Depends: libmicrokde
Description: PwManager/Pi
The embedded version of PwManager/Platform-independend,
the KDE password management program
optimized for 640x480 and 320x240 resolution
on Zaurus PDA