summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -174,3 +174,3 @@ phone/symbian/mroutgen.c
-TARGET = kammu
+TARGET = microkammu
DESTDIR = $(QPEDIR)/lib
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
@@ -49,3 +49,3 @@ SOURCES += gammu.c \
LIBS += -L$(QPEDIR)/lib
-LIBS += -lkammu
+LIBS += -lmicrokammu
#LIBS += -lbluetooth
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
@@ -10,3 +10,3 @@ MOC_DIR = moc
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
LIBS += -L$(QPEDIR)/lib
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
@@ -9,3 +9,3 @@ MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
LIBS += -L$(QPEDIR)/lib
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
@@ -9,3 +9,3 @@ MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
LIBS += -L$(QPEDIR)/lib
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
@@ -12,3 +12,3 @@ DESTDIR = $(QPEDIR)/lib
LIBS += -lmicrokde
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
LIBS += -L$(QPEDIR)/lib
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
@@ -11,3 +11,3 @@ DESTDIR = $(QPEDIR)/lib
LIBS += -lmicrokde
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
LIBS += -L$(QPEDIR)/lib
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
@@ -11,6 +11,5 @@ DESTDIR = $(QPEDIR)/lib
LIBS += -lmicrokde
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
LIBS += -lmicrokdepim
LIBS += -lmicroqtcompat
-#LIBS += -lmicrokcal
LIBS += -L$(QPEDIR)/lib
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 7400251..64e3a4a 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -15,6 +15,5 @@ DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
LIBS += -lmicrokdepim
-#LIBS += -lmicrokcal
LIBS += -lmicrokde
LIBS += -lmicroqtcompat
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
LIBS += -lqpe
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index a8b3f9a..9e05623 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,3 +1,2 @@
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
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index d578a9c..07cd2d8 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -57,3 +57,3 @@ INTERFACES = editaccountsui.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)
diff --git a/kmobilephoneaccess.control b/kmobilephoneaccess.control
index 07559e7..be4a4c2 100644
--- a/kmobilephoneaccess.control
+++ b/kmobilephoneaccess.control
@@ -1,2 +1,2 @@
-Files: bin/kammu lib/libkammu*
+Files: bin/kammu lib/libmicrokammu*
@@ -8,3 +8,2 @@ Version: $KDEPIM_VERSION
License: GPL
-Depends:
Description: Special version of gammu / libgammu
diff --git a/kopiemail.control b/kopiemail.control
index 58d4bfa..77e0e79 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,3 +1,2 @@
Files: bin/ompi apps/Pim/kopiemail.desktop pics/kdepim/kopiemail/* lib/libmicromail* lib/libmicrolibetpan*
-
Priority: optional
diff --git a/korganizer.control b/korganizer.control
index 2910ebd..0224cc3 100644
--- a/korganizer.control
+++ b/korganizer.control
@@ -1,3 +1,2 @@
Files: bin/kopi apps/Pim/korganizer.desktop pics/kdepim/korganizer/* lib/libmicrokcal*
-
Priority: optional
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 5cf9778..e6c3f8d 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -14,6 +14,5 @@ DEFINES += KORG_NOLVALTERNATION
LIBS += -lmicrokdepim
-LIBS += -lkomicrokcal
+LIBS += -lmicrokcal
LIBS += -lmicrokde
LIBS += -lmicroqtcompat
-#LIBS += -lmicrokabc
diff --git a/ksharpPIM-DTMaccess.control b/ksharpPIM-DTMaccess.control
index f735462..545bce4 100644
--- a/ksharpPIM-DTMaccess.control
+++ b/ksharpPIM-DTMaccess.control
@@ -1,3 +1,2 @@
-Files: bin/db2file libmicrokabc_sharp*
-
+Files: bin/db2file lib/libmicrokabc_sharp*
Priority: optional
diff --git a/pimTABicon.control b/pimTABicon.control
index 46458d1..0007c7c 100644
--- a/pimTABicon.control
+++ b/pimTABicon.control
@@ -1,3 +1,2 @@
Files: apps/Pim/.directory pics/ko24ti.png
-
Priority: optional
@@ -8,3 +7,2 @@ Version: $KDEPIM_VERSION
License: GPL
-Depends:
Description: Icon for Pim TAB
diff --git a/pwmanager.control b/pwmanager.control
index 3ea90ce..d346544 100644
--- a/pwmanager.control
+++ b/pwmanager.control
@@ -8,3 +8,3 @@ Version: $KDEPIM_VERSION
License: GPL
-Depends:
+Depends: libmicrokde
Description: PwManager/Pi