summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--desktop/Makefile41
-rw-r--r--desktop/rpm/kdepim_rpm15
-rw-r--r--kde2file/caldump/caldump.pro3
4 files changed, 51 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index ea5f30d..6556191 100644
--- a/Makefile
+++ b/Makefile
@@ -1,99 +1,99 @@
#############################################################################
# Makefile for building: kdepim-desktop
-# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Oct 24 15:00:28 2004
+# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Oct 24 15:40:45 2004
# Project: kdepim-desktop.pro
# Template: subdirs
# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
#############################################################################
MAKEFILE = Makefile
QMAKE = qmake
DEL_FILE = rm -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
SUBTARGETS = \
sub-gammu-emb-common \
sub-gammu-emb-gammu \
sub-libical \
sub-libkcal \
sub-microkde \
sub-libkdepim \
sub-kabc \
sub-korganizer \
sub-kaddressbook \
sub-kabc-plugins-file \
sub-kabc-plugins-dir \
sub-kabc-plugins-file \
sub-kabc-plugins-qtopia \
sub-pwmanager-libcrypt-cipher \
sub-pwmanager-libcrypt-error \
sub-pwmanager-libcrypt-mpi \
sub-pwmanager-libcrypt-zlib \
sub-pwmanager-pwmanager
first: all
all: Makefile $(SUBTARGETS)
gammu/emb/common/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
gammu/emb/gammu/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
libical/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
sub-libical: libical/$(MAKEFILE) FORCE
cd libical && $(MAKE) -f $(MAKEFILE)
libkcal/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
sub-libkcal: libkcal/$(MAKEFILE) FORCE
cd libkcal && $(MAKE) -f $(MAKEFILE)
microkde/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
sub-microkde: microkde/$(MAKEFILE) FORCE
cd microkde && $(MAKE) -f $(MAKEFILE)
libkdepim/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
cd libkdepim && $(MAKE) -f $(MAKEFILE)
kabc/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
sub-kabc: kabc/$(MAKEFILE) FORCE
cd kabc && $(MAKE) -f $(MAKEFILE)
korganizer/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
sub-korganizer: korganizer/$(MAKEFILE) FORCE
cd korganizer && $(MAKE) -f $(MAKEFILE)
kaddressbook/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
cd kaddressbook && $(MAKE) -f $(MAKEFILE)
kabc/plugins/file/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
kabc/plugins/dir/$(MAKEFILE):
@$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
diff --git a/desktop/Makefile b/desktop/Makefile
index eaed1f5..c2fb728 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,2 +1,39 @@
-
-#has to be written \ No newline at end of file
+export KDEPIMDIR = $(shell pwd)
+
+export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < ../version)
+export KDEDIR=/kde_dev/kde
+export KDE_DEV_DIR=/kde_dev/kde32/build/kdepim33_proko2_new/
+all:
+ cd ../kde2file/caldump;qmake;make
+
+install:
+ mkdir -p /opt/kdepimpi
+ mkdir -p /opt/kde3/share/applnk/PIM-pi
+#clear old files:
+ rm -rf /opt/kdepimpi/*
+ rm -f /usr/lib/libmicro*
+ rm -fr /opt/kde3/share/applnk/PIM-pi/*
+ cp -r ../bin/* /opt/kdepimpi/
+ cp ../bin/libmicro* /usr/lib/
+ rm -rf /opt/kdepimpi/libmicro*
+ cd /opt/kdepimpi; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/pwmanager; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/pwmanager/icons22; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/pwmanager/icons16; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/korganizer; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/korganizer/icons16; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/korganizer/iconsmini; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/korganizer/icons16; rm -dfR .xvpics
+ cd /opt/kdepimpi/kdepim/korganizer/iconsmini; rm -dfR .xvpics
+ cd /opt/kdepimpi/kdepim/korganizer; rm -dfR .xvpics
+ cd /opt/kdepimpi/kdepim/kaddressbook; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/kaddressbook/icons22; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim/kaddressbook/icons16; rm -dfR CVS
+ cd /opt/kdepimpi/kdepim; rm -dfR kopiemail
+ cd /opt/kdepimpi/kdepim; rm -f Make*
+ cp -r PIM-pi/* /opt/kde3/share/applnk/PIM-pi/
+ cd /opt/kde3/share/applnk/PIM-pi; rm -fr CVS
+ cp -fr /home/polo/eigene/apps/* /opt/kdepimpi/
+dist:
+ cd rpm;rpmbuild -bb kdepim_rpm \ No newline at end of file
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 68b996b..c9595c4 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,76 +1,81 @@
Summary: A collection of PIM programs
Name: KDE-Pim-Pi
-Version: 1.9.10
+Version: $KDEPIM_VERSION
Release: SuSE9.1
Copyright:GPL
Group: Productivity/Pim
Source:http://sourceforge.net/projects/kdepimpi/
URL:http://sourceforge.net/projects/kdepimpi/
Packager: zautrix
%description
This package contains the platform-independent PIM programs from
www.pi-sync.net, compiled for SuSE 9.1:
KTimeTacker/Pi
KPhone/Pi
KAddressbook/Pi
KOrganizer/Pi
PasswordManager/Pi
These applications do not need anything from the KDE-desktop
at all to run on Linux. However, there is a dependency from
two KDE libs, because a small command line program is included
to make it possible to sync with the KDE-desktop applications.
These applications are independent from the KDE-desktop
environment. That means, nothing of your existing
KDE-desktop setup will be changed, or any data
(calendar-addressbook) used by the KDE-desktop
applications will be changed or accessed.
These applications stores their data and config in
$HOME/kdepim/
However, because the same file format is used,
an easy exchange of data with the KDE-desktop
is possible.
A small command line program is included
to make it possible to sync with the KDE-desktop applications.
You do not need to call this program from the commandline,
it is called from the KDE-Pim/Pi apps when you choose there:
-Sync with KDE_DEsktop.
+Sync with KDE_Desktop.
If something is going wrong, please start the
-KDE-Pim/Pi itself from the console to get detailed output.
+KDE-Pim/Pi program itself from the console to get detailed output.
After installation, you should have a
PIM-pi
folder in your KDE start menu, where you can
start the applications from.
-These programs make it possible to sync easily your Zaurus
+These programs makes it possible to sync your Zaurus easily
(with the KDE-Pim/Pi programs running on the Zaurus)
with the KDE-desktop calendar/addressbook data.
If you want to use that, you have to update your
KDE-desktop to version 3.3.0 or higher.
+Actually - after the (non difficult) configuration is set up -
+with two mouseklicks on the Zaurus,
+the Zaurus syncs with the corresponding KDE-Pim/Pi
+program on the Linux Desktop which syncs automatically
+with the KDE-desktop data.
If you want to use the KDE-desktop calendar/addressbook applications,
-just install these apps and use them as a syncing tool for the
+just install these apps in this package and use them as a syncing tool for the
Zaurus <-> KDE-desktop sync.
The sync requires a network connection from your Zaurus to
the PC. A detailed Sync HowTo is available in the
Help menu of the applications.
These applications makes it also possible, that you can sync
(or just export the data to) your mobile phone with your
data of the KDE-desktop calendar/addressbook applications.
This is tested and working for Nokia mobile phones,
it may work with others as well.
(More info about that: -> Sync HowTo)
NOTE:
You have to make an online update in SuSE 9.1 to make it
possible to get the infrared connection working, such that
you can sync your (Nokia) mobile phone via infrared.
%files
/opt/kde3/share/applnk/PIM-pi/
/opt/kdepimpi/
/usr/lib/libmicro*
diff --git a/kde2file/caldump/caldump.pro b/kde2file/caldump/caldump.pro
index ecc20c5..8f08cc4 100644
--- a/kde2file/caldump/caldump.pro
+++ b/kde2file/caldump/caldump.pro
@@ -1,13 +1,12 @@
TEMPLATE = app
CONFIG += qt
include( ../../variables.pri )
DESTDIR= ../../bin
TARGET = kdecaldump
-INCLUDEPATH += . $(KDEDIR)/include $(KDEDIR)/include/libkcal /kde_dev/kde32/build/kdepim33_proko2_new/libkdepim
-
+INCLUDEPATH += . $(KDEDIR)/include $(KDEDIR)/include/libkcal $(KDE_DEV_DIR)/libkdepim
LIBS += $(KDEDIR)/lib/libkcal.so
LIBS += $(KDEDIR)/lib/libkdepim.so
HEADERS +=
SOURCES += main.cpp