summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-24 14:54:06 (UTC)
committer zautrix <zautrix>2004-10-24 14:54:06 (UTC)
commit20aaf1a699958a9f6fd0a5ba6c4acad91f1f09dd (patch) (side-by-side diff)
tree7e109deda3a85440b8b93262664718a389d178f7
parent42f22a904fb6440a7b4071b2f4f148bee5f71cc0 (diff)
downloadkdepimpi-20aaf1a699958a9f6fd0a5ba6c4acad91f1f09dd.zip
kdepimpi-20aaf1a699958a9f6fd0a5ba6c4acad91f1f09dd.tar.gz
kdepimpi-20aaf1a699958a9f6fd0a5ba6c4acad91f1f09dd.tar.bz2
desktop fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--desktop/Makefile39
-rw-r--r--desktop/rpm/kdepim_rpm15
-rw-r--r--kde2file/caldump/caldump.pro3
4 files changed, 50 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index ea5f30d..6556191 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# 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
diff --git a/desktop/Makefile b/desktop/Makefile
index eaed1f5..c2fb728 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,2 +1,39 @@
+export KDEPIMDIR = $(shell pwd)
-#has to be written \ No newline at end of file
+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,6 +1,6 @@
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
@@ -36,23 +36,28 @@ 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
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
@@ -4,8 +4,7 @@ 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 +=