summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-08 22:22:02 (UTC)
committer zautrix <zautrix>2004-10-08 22:22:02 (UTC)
commit44169895703beb3e8b1551a313d2d341bf742905 (patch) (unidiff)
tree4e337f9b55d544a939185dbcdbad558b1ed2504d
parent10a0e05cc4962d9412a7a5faf3d69a3caf6d1c34 (diff)
downloadkdepimpi-44169895703beb3e8b1551a313d2d341bf742905.zip
kdepimpi-44169895703beb3e8b1551a313d2d341bf742905.tar.gz
kdepimpi-44169895703beb3e8b1551a313d2d341bf742905.tar.bz2
gammu changes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile11
-rw-r--r--Makefile.Embedded2
-rw-r--r--bin/kdepim/korganizer/howtoSYNC.txt2
-rw-r--r--gammu/emb/gammu/gammu.c2
-rw-r--r--phoneaccess.control (renamed from kammu.control)0
5 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 1adfb2c..0b8997e 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,7 @@ SUBDIRS = \
59 $(SUBDIRS_GAMMU) \ 59 $(SUBDIRS_GAMMU) \
60 $(SUBDIRS_PWMANAGER) 60 $(SUBDIRS_PWMANAGER)
61 61
62
62all: build_microkde \ 63all: build_microkde \
63 build_qtopia_plugin \ 64 build_qtopia_plugin \
64 build_opie_plugin \ 65 build_opie_plugin \
@@ -201,8 +202,9 @@ clean:
201 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 202 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
202 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 203 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
203 done 204 done
205
204install: 206install:
205 207
206 cd bin/kdepim; make install 208 cd bin/kdepim; make install
207 cp -r Pim $(QPEDIR)/apps 209 cp -r Pim $(QPEDIR)/apps
208 cp db2file/db2file $(QPEDIR)/bin/db2file 210 cp db2file/db2file $(QPEDIR)/bin/db2file
@@ -211,7 +213,7 @@ install:
211 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop 213 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
212 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop 214 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
213 215
214dist: 216dist:
215 @echo Dont forget to do "make install" before "make dist" 217 @echo Dont forget to do "make install" before "make dist"
216 rm -f *arm.ipk 218 rm -f *arm.ipk
217 rm -f *~ 219 rm -f *~
@@ -224,7 +226,7 @@ dist:
224 endif 226 endif
225 ./mkipks korganizer-alarm.control 227 ./mkipks korganizer-alarm.control
226 ifndef BUILD_NO_GAMMU 228 ifndef BUILD_NO_GAMMU
227 ./mkipks kammu.control 229 ./mkipks phoneaccess.control
228 endif 230 endif
229 ifndef BUILD_NO_PWMANAGER 231 ifndef BUILD_NO_PWMANAGER
230 ./mkipks pwmanager.control 232 ./mkipks pwmanager.control
@@ -256,8 +258,6 @@ tmake: objects \
256 gammu/emb/gammu/Makefile$(PLATFORM) \ 258 gammu/emb/gammu/Makefile$(PLATFORM) \
257 pwmanager/pwmanager/Makefile$(PLATFORM) \ 259 pwmanager/pwmanager/Makefile$(PLATFORM) \
258 260
259
260
261qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro 261qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
262 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) 262 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
263 263
@@ -327,3 +327,4 @@ gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
327 327
328pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro 328pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
329 cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM) 329 cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
330
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 2e1651c..0b8997e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -226,7 +226,7 @@ dist:
226 endif 226 endif
227 ./mkipks korganizer-alarm.control 227 ./mkipks korganizer-alarm.control
228 ifndef BUILD_NO_GAMMU 228 ifndef BUILD_NO_GAMMU
229 ./mkipks kammu.control 229 ./mkipks phoneaccess.control
230 endif 230 endif
231 ifndef BUILD_NO_PWMANAGER 231 ifndef BUILD_NO_PWMANAGER
232 ./mkipks pwmanager.control 232 ./mkipks pwmanager.control
diff --git a/bin/kdepim/korganizer/howtoSYNC.txt b/bin/kdepim/korganizer/howtoSYNC.txt
index c4e80f5..3cab446 100644
--- a/bin/kdepim/korganizer/howtoSYNC.txt
+++ b/bin/kdepim/korganizer/howtoSYNC.txt
@@ -308,7 +308,7 @@ c) Remote file
308 file name of the temp file in the corresponding fields. 308 file name of the temp file in the corresponding fields.
309 309
310d) Mobile device (cell phone) 310d) Mobile device (cell phone)
311 Note: On the Zaurus you have to install the kammu_xxx_arm.ipk package 311 Note: On the Zaurus you have to install the phoneaccess_xxx_arm.ipk package
312 to be able to access mobile phones. 312 to be able to access mobile phones.
313 We mention here only KO/Pi, but the same is valid for KA/Pi. 313 We mention here only KO/Pi, but the same is valid for KA/Pi.
314 Note: 314 Note:
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index c436b90..8db9afb 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -4051,7 +4051,7 @@ static void Backup(int argc, char *argv[])
4051 MemStatus.MemoryType = MEM_ME; 4051 MemStatus.MemoryType = MEM_ME;
4052 error=Phone->GetMemoryStatus(&s, &MemStatus); 4052 error=Phone->GetMemoryStatus(&s, &MemStatus);
4053 if (error==ERR_NONE && MemStatus.MemoryUsed != 0) { 4053 if (error==ERR_NONE && MemStatus.MemoryUsed != 0) {
4054 if (answer_yes(" Backup phone phonebook")) DoBackup = true; 4054 /*LRif (answer_yes(" Backup phone phonebook")) */DoBackup = true;
4055 } 4055 }
4056 } 4056 }
4057 if (DoBackup) { 4057 if (DoBackup) {
diff --git a/kammu.control b/phoneaccess.control
index 07559e7..07559e7 100644
--- a/kammu.control
+++ b/phoneaccess.control