summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-24 14:54:06 (UTC)
committer zautrix <zautrix>2004-10-24 14:54:06 (UTC)
commit20aaf1a699958a9f6fd0a5ba6c4acad91f1f09dd (patch) (unidiff)
tree7e109deda3a85440b8b93262664718a389d178f7
parent42f22a904fb6440a7b4071b2f4f148bee5f71cc0 (diff)
downloadkdepimpi-20aaf1a699958a9f6fd0a5ba6c4acad91f1f09dd.zip
kdepimpi-20aaf1a699958a9f6fd0a5ba6c4acad91f1f09dd.tar.gz
kdepimpi-20aaf1a699958a9f6fd0a5ba6c4acad91f1f09dd.tar.bz2
desktop fixes
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,15 +1,15 @@
1############################################################################# 1#############################################################################
2# Makefile for building: kdepim-desktop 2# Makefile for building: kdepim-desktop
3# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Oct 24 15:00:28 2004 3# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Oct 24 15:40:45 2004
4# Project: kdepim-desktop.pro 4# Project: kdepim-desktop.pro
5# Template: subdirs 5# Template: subdirs
6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro 6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
7############################################################################# 7#############################################################################
8 8
9 MAKEFILE =Makefile 9 MAKEFILE =Makefile
10 QMAKE =qmake 10 QMAKE =qmake
11DEL_FILE = rm -f 11DEL_FILE = rm -f
12CHK_DIR_EXISTS= test -d 12CHK_DIR_EXISTS= test -d
13MKDIR = mkdir -p 13MKDIR = mkdir -p
14 SUBTARGETS = \ 14 SUBTARGETS = \
15 sub-gammu-emb-common \ 15 sub-gammu-emb-common \
diff --git a/desktop/Makefile b/desktop/Makefile
index eaed1f5..c2fb728 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,2 +1,39 @@
1 1export KDEPIMDIR = $(shell pwd)
2#has to be written \ No newline at end of file 2
3export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < ../version)
4export KDEDIR=/kde_dev/kde
5export KDE_DEV_DIR=/kde_dev/kde32/build/kdepim33_proko2_new/
6all:
7 cd ../kde2file/caldump;qmake;make
8
9 install:
10 mkdir -p /opt/kdepimpi
11 mkdir -p /opt/kde3/share/applnk/PIM-pi
12#clear old files:
13 rm -rf /opt/kdepimpi/*
14 rm -f /usr/lib/libmicro*
15 rm -fr /opt/kde3/share/applnk/PIM-pi/*
16 cp -r ../bin/* /opt/kdepimpi/
17 cp ../bin/libmicro* /usr/lib/
18 rm -rf /opt/kdepimpi/libmicro*
19 cd /opt/kdepimpi; rm -dfR CVS
20 cd /opt/kdepimpi/kdepim; rm -dfR CVS
21 cd /opt/kdepimpi/kdepim/pwmanager; rm -dfR CVS
22 cd /opt/kdepimpi/kdepim/pwmanager/icons22; rm -dfR CVS
23 cd /opt/kdepimpi/kdepim/pwmanager/icons16; rm -dfR CVS
24 cd /opt/kdepimpi/kdepim/korganizer; rm -dfR CVS
25 cd /opt/kdepimpi/kdepim/korganizer/icons16; rm -dfR CVS
26 cd /opt/kdepimpi/kdepim/korganizer/iconsmini; rm -dfR CVS
27 cd /opt/kdepimpi/kdepim/korganizer/icons16; rm -dfR .xvpics
28 cd /opt/kdepimpi/kdepim/korganizer/iconsmini; rm -dfR .xvpics
29 cd /opt/kdepimpi/kdepim/korganizer; rm -dfR .xvpics
30 cd /opt/kdepimpi/kdepim/kaddressbook; rm -dfR CVS
31 cd /opt/kdepimpi/kdepim/kaddressbook/icons22; rm -dfR CVS
32 cd /opt/kdepimpi/kdepim/kaddressbook/icons16; rm -dfR CVS
33 cd /opt/kdepimpi/kdepim; rm -dfR kopiemail
34 cd /opt/kdepimpi/kdepim; rm -f Make*
35 cp -r PIM-pi/* /opt/kde3/share/applnk/PIM-pi/
36 cd /opt/kde3/share/applnk/PIM-pi; rm -fr CVS
37 cp -fr /home/polo/eigene/apps/* /opt/kdepimpi/
38dist:
39 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,15 +1,15 @@
1Summary: A collection of PIM programs 1Summary: A collection of PIM programs
2Name: KDE-Pim-Pi 2Name: KDE-Pim-Pi
3Version: 1.9.10 3Version: $KDEPIM_VERSION
4Release: SuSE9.1 4Release: SuSE9.1
5Copyright:GPL 5Copyright:GPL
6Group: Productivity/Pim 6Group: Productivity/Pim
7Source:http://sourceforge.net/projects/kdepimpi/ 7Source:http://sourceforge.net/projects/kdepimpi/
8URL:http://sourceforge.net/projects/kdepimpi/ 8URL:http://sourceforge.net/projects/kdepimpi/
9Packager: zautrix 9Packager: zautrix
10 10
11%description 11%description
12This package contains the platform-independent PIM programs from 12This package contains the platform-independent PIM programs from
13www.pi-sync.net, compiled for SuSE 9.1: 13www.pi-sync.net, compiled for SuSE 9.1:
14KTimeTacker/Pi 14KTimeTacker/Pi
15KPhone/Pi 15KPhone/Pi
@@ -27,41 +27,46 @@ environment. That means, nothing of your existing
27KDE-desktop setup will be changed, or any data 27KDE-desktop setup will be changed, or any data
28(calendar-addressbook) used by the KDE-desktop 28(calendar-addressbook) used by the KDE-desktop
29applications will be changed or accessed. 29applications will be changed or accessed.
30These applications stores their data and config in 30These applications stores their data and config in
31$HOME/kdepim/ 31$HOME/kdepim/
32However, because the same file format is used, 32However, because the same file format is used,
33an easy exchange of data with the KDE-desktop 33an easy exchange of data with the KDE-desktop
34is possible. 34is possible.
35A small command line program is included 35A small command line program is included
36to make it possible to sync with the KDE-desktop applications. 36to make it possible to sync with the KDE-desktop applications.
37You do not need to call this program from the commandline, 37You do not need to call this program from the commandline,
38it is called from the KDE-Pim/Pi apps when you choose there: 38it is called from the KDE-Pim/Pi apps when you choose there:
39Sync with KDE_DEsktop. 39Sync with KDE_Desktop.
40If something is going wrong, please start the 40If something is going wrong, please start the
41KDE-Pim/Pi itself from the console to get detailed output. 41KDE-Pim/Pi program itself from the console to get detailed output.
42 42
43After installation, you should have a 43After installation, you should have a
44PIM-pi 44PIM-pi
45folder in your KDE start menu, where you can 45folder in your KDE start menu, where you can
46start the applications from. 46start the applications from.
47 47
48These programs make it possible to sync easily your Zaurus 48These programs makes it possible to sync your Zaurus easily
49(with the KDE-Pim/Pi programs running on the Zaurus) 49(with the KDE-Pim/Pi programs running on the Zaurus)
50with the KDE-desktop calendar/addressbook data. 50with the KDE-desktop calendar/addressbook data.
51If you want to use that, you have to update your 51If you want to use that, you have to update your
52KDE-desktop to version 3.3.0 or higher. 52KDE-desktop to version 3.3.0 or higher.
53Actually - after the (non difficult) configuration is set up -
54with two mouseklicks on the Zaurus,
55the Zaurus syncs with the corresponding KDE-Pim/Pi
56program on the Linux Desktop which syncs automatically
57with the KDE-desktop data.
53 58
54If you want to use the KDE-desktop calendar/addressbook applications, 59If you want to use the KDE-desktop calendar/addressbook applications,
55just install these apps and use them as a syncing tool for the 60just install these apps in this package and use them as a syncing tool for the
56Zaurus <-> KDE-desktop sync. 61Zaurus <-> KDE-desktop sync.
57The sync requires a network connection from your Zaurus to 62The sync requires a network connection from your Zaurus to
58the PC. A detailed Sync HowTo is available in the 63the PC. A detailed Sync HowTo is available in the
59Help menu of the applications. 64Help menu of the applications.
60 65
61These applications makes it also possible, that you can sync 66These applications makes it also possible, that you can sync
62(or just export the data to) your mobile phone with your 67(or just export the data to) your mobile phone with your
63data of the KDE-desktop calendar/addressbook applications. 68data of the KDE-desktop calendar/addressbook applications.
64This is tested and working for Nokia mobile phones, 69This is tested and working for Nokia mobile phones,
65it may work with others as well. 70it may work with others as well.
66(More info about that: -> Sync HowTo) 71(More info about that: -> Sync HowTo)
67 72
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 @@
1 1
2TEMPLATE = app 2TEMPLATE = app
3CONFIG += qt 3CONFIG += qt
4include( ../../variables.pri ) 4include( ../../variables.pri )
5DESTDIR= ../../bin 5DESTDIR= ../../bin
6 TARGET = kdecaldump 6 TARGET = kdecaldump
7INCLUDEPATH += . $(KDEDIR)/include $(KDEDIR)/include/libkcal /kde_dev/kde32/build/kdepim33_proko2_new/libkdepim 7INCLUDEPATH += . $(KDEDIR)/include $(KDEDIR)/include/libkcal $(KDE_DEV_DIR)/libkdepim
8
9LIBS += $(KDEDIR)/lib/libkcal.so 8LIBS += $(KDEDIR)/lib/libkcal.so
10LIBS += $(KDEDIR)/lib/libkdepim.so 9LIBS += $(KDEDIR)/lib/libkdepim.so
11HEADERS += 10HEADERS +=
12 11
13SOURCES += main.cpp 12SOURCES += main.cpp