summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile1
-rw-r--r--Makefile.Embedded1
-rw-r--r--bin/kdepim/SyncHowto.txt117
-rw-r--r--version2
4 files changed, 103 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 467710f..a9ea199 100644
--- a/Makefile
+++ b/Makefile
@@ -159,192 +159,193 @@ variable_info:
159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) 162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
164 ifndef BUILD_NO_SHARP_PLUGIN 164 ifndef BUILD_NO_SHARP_PLUGIN
165 @echo SHARPDTMSDK=$(SHARPDTMSDK) 165 @echo SHARPDTMSDK=$(SHARPDTMSDK)
166 endif 166 endif
167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
169 @echo -------------------------------------- 169 @echo --------------------------------------
170 170
171variable_test: variable_info 171variable_test: variable_info
172 @echo KDEPIM buildsystem, variablecheck... 172 @echo KDEPIM buildsystem, variablecheck...
173 ifndef KDEPIMDIR 173 ifndef KDEPIMDIR
174 @echo KDEPIMDIR is not defined. 174 @echo KDEPIMDIR is not defined.
175 $(error KDEPIMDIR is not defined) 175 $(error KDEPIMDIR is not defined)
176 endif 176 endif
177 ifndef PLATFORM 177 ifndef PLATFORM
178 @echo PLATFORM is not defined. 178 @echo PLATFORM is not defined.
179 $(error PLATFORM is not defined) 179 $(error PLATFORM is not defined)
180 endif 180 endif
181 ifdef BUILD_NO_LDAP_PLUGIN 181 ifdef BUILD_NO_LDAP_PLUGIN
182 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 182 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
183 endif 183 endif
184 ifdef BUILD_NO_OPIE_PLUGIN 184 ifdef BUILD_NO_OPIE_PLUGIN
185 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 185 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
186 endif 186 endif
187 ifdef BUILD_NO_QTOPIA_PLUGIN 187 ifdef BUILD_NO_QTOPIA_PLUGIN
188 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) 188 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
189 endif 189 endif
190 ifdef BUILD_NO_MICROMAIL 190 ifdef BUILD_NO_MICROMAIL
191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
192 endif 192 endif
193 ifdef BUILD_NO_SHARP_PLUGIN 193 ifdef BUILD_NO_SHARP_PLUGIN
194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
195 else 195 else
196 ifndef SHARPDTMSDK 196 ifndef SHARPDTMSDK
197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
198 $(error SHARPDTMSDK is not defined) 198 $(error SHARPDTMSDK is not defined)
199 endif 199 endif
200 endif 200 endif
201 ifdef BUILD_NO_GAMMU 201 ifdef BUILD_NO_GAMMU
202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) 202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
203 endif 203 endif
204 ifdef BUILD_NO_PWMANAGER 204 ifdef BUILD_NO_PWMANAGER
205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) 205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
206 endif 206 endif
207 @echo -------------------------------------- 207 @echo --------------------------------------
208 208
209 209
210objects: 210objects:
211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
213 mkdir -p libical/lib/$(PLATFORM) 213 mkdir -p libical/lib/$(PLATFORM)
214 mkdir -p pwmanager/libcrypt/$(PLATFORM) 214 mkdir -p pwmanager/libcrypt/$(PLATFORM)
215 215
216clean: 216clean:
217 rm -rf libical/lib/$(PLATFORM)/*; 217 rm -rf libical/lib/$(PLATFORM)/*;
218 rm -rf pwmanager/libcrypt/$(PLATFORM)/*; 218 rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
219 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 219 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
220 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 220 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
221 done 221 done
222 222
223install: 223install:
224 224
225 cd bin/kdepim; make install 225 cd bin/kdepim; make install
226 cp -r Pim $(QPEDIR)/apps 226 cp -r Pim $(QPEDIR)/apps
227 cp db2file/db2file $(QPEDIR)/bin/db2file 227 cp db2file/db2file $(QPEDIR)/bin/db2file
228 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 228 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
229 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 229 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
230 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop 230 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
231 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop 231 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
232 232
233dist: 233dist:
234 @echo Dont forget to do "make install" before "make dist" 234 @echo Dont forget to do "make install" before "make dist"
235 rm -f *arm.ipk 235 rm -f *arm.ipk
236 rm -f *~ 236 rm -f *~
237 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim 237 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
238 mkipks kmicrokdelibs.control 238 mkipks kmicrokdelibs.control
239 mkipks korganizer.control 239 mkipks korganizer.control
240 mkipks kaddressbook.control 240 mkipks kaddressbook.control
241 ifndef BUILD_NO_MICROMAIL 241 ifndef BUILD_NO_MICROMAIL
242 mkipks kopiemail.control 242 mkipks kopiemail.control
243 endif 243 endif
244 ifndef BUILD_NO_SHARP_PLUGIN 244 ifndef BUILD_NO_SHARP_PLUGIN
245 mkipks ksharpPIM-DTMaccess.control 245 mkipks ksharpPIM-DTMaccess.control
246 endif 246 endif
247 mkipks korganizer-alarm.control 247 mkipks korganizer-alarm.control
248 ifndef BUILD_NO_GAMMU 248 ifndef BUILD_NO_GAMMU
249 mkipks kmobilephoneaccess.control 249 mkipks kmobilephoneaccess.control
250 endif 250 endif
251 ifndef BUILD_NO_PWMANAGER 251 ifndef BUILD_NO_PWMANAGER
252 mkipks pwmanager.control 252 mkipks pwmanager.control
253 endif 253 endif
254 mkipks pimTABicon.control 254 mkipks pimTABicon.control
255 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk
255 256
256tmake: objects \ 257tmake: objects \
257 qtcompat/Makefile$(PLATFORM) \ 258 qtcompat/Makefile$(PLATFORM) \
258 microkde/Makefile$(PLATFORM) \ 259 microkde/Makefile$(PLATFORM) \
259 libkcal/Makefile$(PLATFORM) \ 260 libkcal/Makefile$(PLATFORM) \
260 libkdepim/Makefile$(PLATFORM) \ 261 libkdepim/Makefile$(PLATFORM) \
261 korganizer/Makefile$(PLATFORM) \ 262 korganizer/Makefile$(PLATFORM) \
262 kalarmd/Makefile$(PLATFORM) \ 263 kalarmd/Makefile$(PLATFORM) \
263 libical/src/libical/Makefile$(PLATFORM) \ 264 libical/src/libical/Makefile$(PLATFORM) \
264 libical/src/libicalss/Makefile$(PLATFORM) \ 265 libical/src/libicalss/Makefile$(PLATFORM) \
265 kabc/Makefile$(PLATFORM) \ 266 kabc/Makefile$(PLATFORM) \
266 kabc/formats/binary/Makefile$(PLATFORM) \ 267 kabc/formats/binary/Makefile$(PLATFORM) \
267 kabc/plugins/file/Makefile$(PLATFORM) \ 268 kabc/plugins/file/Makefile$(PLATFORM) \
268 kabc/plugins/dir/Makefile$(PLATFORM) \ 269 kabc/plugins/dir/Makefile$(PLATFORM) \
269 kabc/plugins/ldap/Makefile$(PLATFORM) \ 270 kabc/plugins/ldap/Makefile$(PLATFORM) \
270 kabc/plugins/opie/Makefile$(PLATFORM) \ 271 kabc/plugins/opie/Makefile$(PLATFORM) \
271 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 272 kabc/plugins/qtopia/Makefile$(PLATFORM) \
272 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 273 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
273 kaddressbook/Makefile$(PLATFORM) \ 274 kaddressbook/Makefile$(PLATFORM) \
274 kmicromail/Makefile$(PLATFORM) \ 275 kmicromail/Makefile$(PLATFORM) \
275 kmicromail/libetpan/Makefile$(PLATFORM) \ 276 kmicromail/libetpan/Makefile$(PLATFORM) \
276 kmicromail/libmailwrapper/Makefile$(PLATFORM) \ 277 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
277 gammu/emb/common/Makefile$(PLATFORM) \ 278 gammu/emb/common/Makefile$(PLATFORM) \
278 gammu/emb/gammu/Makefile$(PLATFORM) \ 279 gammu/emb/gammu/Makefile$(PLATFORM) \
279 pwmanager/pwmanager/Makefile$(PLATFORM) \ 280 pwmanager/pwmanager/Makefile$(PLATFORM) \
280 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \ 281 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
281 pwmanager/libcrypt/error/Makefile$(PLATFORM) \ 282 pwmanager/libcrypt/error/Makefile$(PLATFORM) \
282 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \ 283 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
283 pwmanager/libcrypt/zlib/Makefile$(PLATFORM) 284 pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
284 285
285qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro 286qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
286 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) 287 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
287 288
288microkde/Makefile$(PLATFORM): microkde/microkdeE.pro 289microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
289 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) 290 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
290 291
291libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro 292libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
292 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) 293 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
293 294
294 295
295libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro 296libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
296 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) 297 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
297 298
298kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro 299kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
299 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) 300 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
300 301
301korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro 302korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
302 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) 303 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
303 304
304libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro 305libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
305 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM) 306 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
306 307
307libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro 308libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
308 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM) 309 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
309 310
310kabc/Makefile$(PLATFORM): kabc/kabcE.pro 311kabc/Makefile$(PLATFORM): kabc/kabcE.pro
311 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) 312 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
312 313
313kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro 314kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
314 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) 315 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
315 316
316kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro 317kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
317 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM) 318 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
318 319
319kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro 320kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
320 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM) 321 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
321 322
322kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro 323kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
323 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM) 324 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
324 325
325kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro 326kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
326 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM) 327 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
327 328
328kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro 329kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
329 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM) 330 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
330 331
331kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro 332kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
332 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM) 333 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
333 334
334kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro 335kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
335 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) 336 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
336 337
337kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro 338kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
338 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) 339 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
339 340
340kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro 341kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
341 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) 342 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
342 343
343kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro 344kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
344 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) 345 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
345 346
346gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro 347gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
347 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM) 348 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
348 349
349gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro 350gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
350 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM) 351 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 467710f..a9ea199 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -159,192 +159,193 @@ variable_info:
159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) 162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
164 ifndef BUILD_NO_SHARP_PLUGIN 164 ifndef BUILD_NO_SHARP_PLUGIN
165 @echo SHARPDTMSDK=$(SHARPDTMSDK) 165 @echo SHARPDTMSDK=$(SHARPDTMSDK)
166 endif 166 endif
167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
169 @echo -------------------------------------- 169 @echo --------------------------------------
170 170
171variable_test: variable_info 171variable_test: variable_info
172 @echo KDEPIM buildsystem, variablecheck... 172 @echo KDEPIM buildsystem, variablecheck...
173 ifndef KDEPIMDIR 173 ifndef KDEPIMDIR
174 @echo KDEPIMDIR is not defined. 174 @echo KDEPIMDIR is not defined.
175 $(error KDEPIMDIR is not defined) 175 $(error KDEPIMDIR is not defined)
176 endif 176 endif
177 ifndef PLATFORM 177 ifndef PLATFORM
178 @echo PLATFORM is not defined. 178 @echo PLATFORM is not defined.
179 $(error PLATFORM is not defined) 179 $(error PLATFORM is not defined)
180 endif 180 endif
181 ifdef BUILD_NO_LDAP_PLUGIN 181 ifdef BUILD_NO_LDAP_PLUGIN
182 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 182 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
183 endif 183 endif
184 ifdef BUILD_NO_OPIE_PLUGIN 184 ifdef BUILD_NO_OPIE_PLUGIN
185 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 185 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
186 endif 186 endif
187 ifdef BUILD_NO_QTOPIA_PLUGIN 187 ifdef BUILD_NO_QTOPIA_PLUGIN
188 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) 188 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
189 endif 189 endif
190 ifdef BUILD_NO_MICROMAIL 190 ifdef BUILD_NO_MICROMAIL
191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
192 endif 192 endif
193 ifdef BUILD_NO_SHARP_PLUGIN 193 ifdef BUILD_NO_SHARP_PLUGIN
194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
195 else 195 else
196 ifndef SHARPDTMSDK 196 ifndef SHARPDTMSDK
197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
198 $(error SHARPDTMSDK is not defined) 198 $(error SHARPDTMSDK is not defined)
199 endif 199 endif
200 endif 200 endif
201 ifdef BUILD_NO_GAMMU 201 ifdef BUILD_NO_GAMMU
202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) 202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
203 endif 203 endif
204 ifdef BUILD_NO_PWMANAGER 204 ifdef BUILD_NO_PWMANAGER
205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) 205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
206 endif 206 endif
207 @echo -------------------------------------- 207 @echo --------------------------------------
208 208
209 209
210objects: 210objects:
211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
213 mkdir -p libical/lib/$(PLATFORM) 213 mkdir -p libical/lib/$(PLATFORM)
214 mkdir -p pwmanager/libcrypt/$(PLATFORM) 214 mkdir -p pwmanager/libcrypt/$(PLATFORM)
215 215
216clean: 216clean:
217 rm -rf libical/lib/$(PLATFORM)/*; 217 rm -rf libical/lib/$(PLATFORM)/*;
218 rm -rf pwmanager/libcrypt/$(PLATFORM)/*; 218 rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
219 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 219 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
220 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 220 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
221 done 221 done
222 222
223install: 223install:
224 224
225 cd bin/kdepim; make install 225 cd bin/kdepim; make install
226 cp -r Pim $(QPEDIR)/apps 226 cp -r Pim $(QPEDIR)/apps
227 cp db2file/db2file $(QPEDIR)/bin/db2file 227 cp db2file/db2file $(QPEDIR)/bin/db2file
228 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 228 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
229 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 229 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
230 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop 230 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
231 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop 231 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
232 232
233dist: 233dist:
234 @echo Dont forget to do "make install" before "make dist" 234 @echo Dont forget to do "make install" before "make dist"
235 rm -f *arm.ipk 235 rm -f *arm.ipk
236 rm -f *~ 236 rm -f *~
237 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim 237 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
238 mkipks kmicrokdelibs.control 238 mkipks kmicrokdelibs.control
239 mkipks korganizer.control 239 mkipks korganizer.control
240 mkipks kaddressbook.control 240 mkipks kaddressbook.control
241 ifndef BUILD_NO_MICROMAIL 241 ifndef BUILD_NO_MICROMAIL
242 mkipks kopiemail.control 242 mkipks kopiemail.control
243 endif 243 endif
244 ifndef BUILD_NO_SHARP_PLUGIN 244 ifndef BUILD_NO_SHARP_PLUGIN
245 mkipks ksharpPIM-DTMaccess.control 245 mkipks ksharpPIM-DTMaccess.control
246 endif 246 endif
247 mkipks korganizer-alarm.control 247 mkipks korganizer-alarm.control
248 ifndef BUILD_NO_GAMMU 248 ifndef BUILD_NO_GAMMU
249 mkipks kmobilephoneaccess.control 249 mkipks kmobilephoneaccess.control
250 endif 250 endif
251 ifndef BUILD_NO_PWMANAGER 251 ifndef BUILD_NO_PWMANAGER
252 mkipks pwmanager.control 252 mkipks pwmanager.control
253 endif 253 endif
254 mkipks pimTABicon.control 254 mkipks pimTABicon.control
255 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk
255 256
256tmake: objects \ 257tmake: objects \
257 qtcompat/Makefile$(PLATFORM) \ 258 qtcompat/Makefile$(PLATFORM) \
258 microkde/Makefile$(PLATFORM) \ 259 microkde/Makefile$(PLATFORM) \
259 libkcal/Makefile$(PLATFORM) \ 260 libkcal/Makefile$(PLATFORM) \
260 libkdepim/Makefile$(PLATFORM) \ 261 libkdepim/Makefile$(PLATFORM) \
261 korganizer/Makefile$(PLATFORM) \ 262 korganizer/Makefile$(PLATFORM) \
262 kalarmd/Makefile$(PLATFORM) \ 263 kalarmd/Makefile$(PLATFORM) \
263 libical/src/libical/Makefile$(PLATFORM) \ 264 libical/src/libical/Makefile$(PLATFORM) \
264 libical/src/libicalss/Makefile$(PLATFORM) \ 265 libical/src/libicalss/Makefile$(PLATFORM) \
265 kabc/Makefile$(PLATFORM) \ 266 kabc/Makefile$(PLATFORM) \
266 kabc/formats/binary/Makefile$(PLATFORM) \ 267 kabc/formats/binary/Makefile$(PLATFORM) \
267 kabc/plugins/file/Makefile$(PLATFORM) \ 268 kabc/plugins/file/Makefile$(PLATFORM) \
268 kabc/plugins/dir/Makefile$(PLATFORM) \ 269 kabc/plugins/dir/Makefile$(PLATFORM) \
269 kabc/plugins/ldap/Makefile$(PLATFORM) \ 270 kabc/plugins/ldap/Makefile$(PLATFORM) \
270 kabc/plugins/opie/Makefile$(PLATFORM) \ 271 kabc/plugins/opie/Makefile$(PLATFORM) \
271 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 272 kabc/plugins/qtopia/Makefile$(PLATFORM) \
272 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 273 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
273 kaddressbook/Makefile$(PLATFORM) \ 274 kaddressbook/Makefile$(PLATFORM) \
274 kmicromail/Makefile$(PLATFORM) \ 275 kmicromail/Makefile$(PLATFORM) \
275 kmicromail/libetpan/Makefile$(PLATFORM) \ 276 kmicromail/libetpan/Makefile$(PLATFORM) \
276 kmicromail/libmailwrapper/Makefile$(PLATFORM) \ 277 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
277 gammu/emb/common/Makefile$(PLATFORM) \ 278 gammu/emb/common/Makefile$(PLATFORM) \
278 gammu/emb/gammu/Makefile$(PLATFORM) \ 279 gammu/emb/gammu/Makefile$(PLATFORM) \
279 pwmanager/pwmanager/Makefile$(PLATFORM) \ 280 pwmanager/pwmanager/Makefile$(PLATFORM) \
280 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \ 281 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
281 pwmanager/libcrypt/error/Makefile$(PLATFORM) \ 282 pwmanager/libcrypt/error/Makefile$(PLATFORM) \
282 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \ 283 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
283 pwmanager/libcrypt/zlib/Makefile$(PLATFORM) 284 pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
284 285
285qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro 286qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
286 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) 287 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
287 288
288microkde/Makefile$(PLATFORM): microkde/microkdeE.pro 289microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
289 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) 290 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
290 291
291libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro 292libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
292 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) 293 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
293 294
294 295
295libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro 296libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
296 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) 297 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
297 298
298kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro 299kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
299 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) 300 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
300 301
301korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro 302korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
302 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) 303 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
303 304
304libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro 305libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
305 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM) 306 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
306 307
307libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro 308libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
308 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM) 309 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
309 310
310kabc/Makefile$(PLATFORM): kabc/kabcE.pro 311kabc/Makefile$(PLATFORM): kabc/kabcE.pro
311 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) 312 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
312 313
313kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro 314kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
314 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) 315 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
315 316
316kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro 317kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
317 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM) 318 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
318 319
319kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro 320kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
320 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM) 321 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
321 322
322kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro 323kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
323 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM) 324 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
324 325
325kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro 326kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
326 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM) 327 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
327 328
328kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro 329kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
329 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM) 330 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
330 331
331kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro 332kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
332 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM) 333 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
333 334
334kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro 335kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
335 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) 336 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
336 337
337kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro 338kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
338 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) 339 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
339 340
340kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro 341kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
341 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) 342 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
342 343
343kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro 344kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
344 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) 345 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
345 346
346gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro 347gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
347 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM) 348 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
348 349
349gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro 350gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
350 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM) 351 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
diff --git a/bin/kdepim/SyncHowto.txt b/bin/kdepim/SyncHowto.txt
index 6c1da16..64f6f14 100644
--- a/bin/kdepim/SyncHowto.txt
+++ b/bin/kdepim/SyncHowto.txt
@@ -1,340 +1,423 @@
1WARNING: 1WARNING:
2YOU MAY GET UNEXPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS, 2YOU MAY GET UNEXPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS,
3IF YOU CHANGE AN EVENT ON THE FIRST DEVICE AND SYNC IMMEDIATELY FROM 3IF YOU CHANGE AN EVENT ON THE FIRST DEVICE AND SYNC IMMEDIATELY FROM
4THE OTHER DEVICE WITH THIS DEVICE, IF THE CLOCKS OF THE TWO DEVICES 4THE OTHER DEVICE WITH THIS DEVICE, IF THE CLOCKS OF THE TWO DEVICES
5HAVE TOO MUCH DIFFERENCE. 5HAVE TOO MUCH DIFFERENCE.
6 6
7In other words: Please make sure, that the clocks of the devices 7In other words: Please make sure, that the clocks of the devices
8you want to sync have only a difference of some seconds! 8you want to sync have only a difference of some seconds!
9 9
10 10
11CONTENT: 11CONTENT:
12 12
130) How syncing works 130) How syncing works
141) Qick overview of settings 141) Qick overview of settings
152) Sync settings in sync dialog 152) Sync settings in sync dialog
163) Syncing background 163) Syncing background
174) Sync preferences 174) Sync preferences
185) Details about sync profile kinds 185) How a filter works
196) Details about sync profile kinds
19 20
20************************************************************************* 21*************************************************************************
210) How syncing works 220) How syncing works
22************************************************************************* 23*************************************************************************
23 24
24Note: 25Note:
25The recommended and easiest way to syncronize two devices where 26The recommended and easiest way to syncronize two devices where
26KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync". 27KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync".
27Details about that in 5) b). 28Details about that in 6) b).
28 29
29In KDE-Pim/Pi you can synchronize ( sync ) your calendar/addressbook/ 30In KDE-Pim/Pi you can synchronize ( sync ) your calendar/addressbook/
30passwordfile with another calendar/addressbook/passwordfile, 31passwordfile with another calendar/addressbook/passwordfile,
31by syncing your (local) calendar/addressbook/passwordfile 32by syncing your (local) calendar/addressbook/passwordfile
32with a (remote) file. 33with a (remote) file.
33This remote file may on your local filesystem 34This remote file may on your local filesystem
34or on another (remote) device. 35or on another (remote) device.
35 36
36If you want to sync with another remote device, you have to create 37If you want to sync with another remote device, you have to create
37a sync profile. 38a sync profile.
38You have two choices for choosing the profil kind: 39You have two choices for choosing the profil kind:
39I) You can choose profile kind "Remote file" and specify a 40I) You can choose profile kind "Remote file" and specify a
40 command line download/upload command ( like scp, ftp, ...) to 41 command line download/upload command ( like scp, ftp, ...) to
41 a) download the remote file to your local machine to a temp file 42 a) download the remote file to your local machine to a temp file
42 b) sync with this temp file 43 b) sync with this temp file
43 c) upload the synced file to the remote device 44 c) upload the synced file to the remote device
44II) If you want to sync with a device, where KO/Pi( or KA/Pi, PWM/Pi) is 45II) If you want to sync with a device, where KO/Pi( or KA/Pi, PWM/Pi) is
45 installed, you can easily get the remote file via network 46 installed, you can easily get the remote file via network
46 with the build in file transfer feature: 47 with the build in file transfer feature:
47 Choose profile kind "Pi-Sync" and 48 Choose profile kind "Pi-Sync" and
48 a) Start KO/Pi,KA/Pi or PWM/Pi on remote device and 49 a) Start KO/Pi,KA/Pi or PWM/Pi on remote device and
49 enable "Pi-Sync" on remote device with password and port. 50 enable "Pi-Sync" on remote device with password and port.
50 b) Specify password, port and IP address in your profile. 51 b) Specify password, port and IP address in your profile.
51 52
52 53
53You can sync with your mobile phone as well. 54You can sync with your mobile phone as well.
54Everything is explained in more details below. 55Everything is explained in more details below.
55 56
56NOTE: 57NOTE:
57If you do not use profile kind "Pi-Sync", 58If you do not use profile kind "Pi-Sync",
58it is recommended to close 59it is recommended to close
59a running KO/Pi (KA/Pi, PWM/Pi) on the remote device. 60a running KO/Pi (KA/Pi, PWM/Pi) on the remote device.
60(Note: KO/Pi(KA/Pi, PWM/Pi) running on Zaurus with 61(Note: KO/Pi(KA/Pi, PWM/Pi) running on Zaurus with
61FastLoad enabled will never be closed!) 62FastLoad enabled will never be closed!)
62After syncing with a running KO/Pi on the remote device, 63After syncing with a running KO/Pi on the remote device,
63a "save" on the remote device will tell you that it needs to merge (sync). 64a "save" on the remote device will tell you that it needs to merge (sync).
64After merging (just a syncing with the changed file) 65After merging (just a syncing with the changed file)
65you will get the new data showing in remote KO/Pi. 66you will get the new data showing in remote KO/Pi.
66 67
67************************************************************************* 68*************************************************************************
681) Qick overview of settings 691) Qick overview of settings
69************************************************************************* 70*************************************************************************
70 71
71a) Open sync settings dialog (Menu Synchronize - Configure...) 72a) Open sync settings dialog (Menu Synchronize - Configure...)
72b) Give your device a unique name. 73b) Give your device a unique name.
73 (unique in the set of all devices you want to sync with). 74 (unique in the set of all devices you want to sync with).
74 If you have already configured another devive and created 75 If you have already configured another devive and created
75 there a sync profile to sync with this device, give your device 76 there a sync profile to sync with this device, give your device
76 the same name as this sync profile! The same name is important, 77 the same name as this sync profile! The same name is important,
77 because it makes it possible to sync first A->B 78 because it makes it possible to sync first A->B
78 (A local device, that performs the sync, B remote device) 79 (A local device, that performs the sync, B remote device)
79 and then B->A. Such that the B->A sync knows about the 80 and then B->A. Such that the B->A sync knows about the
80 already performed A->B sync. 81 already performed A->B sync.
81 That means: It is unimportant if you sync A->B or B->A, 82 That means: It is unimportant if you sync A->B or B->A,
82 the devices A and B will be synced properly. 83 the devices A and B will be synced properly.
83c) Create a new sync profile and give it a unique name. 84c) Create a new sync profile and give it a unique name.
84 (unique in the set of all sync profiles on this device). 85 (unique in the set of all sync profiles on this device).
85 If you want to sync with a device, where KO/Pi is already installed 86 If you want to sync with a device, where KO/Pi is already installed
86 and which has a given unique device name, use this device name as 87 and which has a given unique device name, use this device name as
87 your profile name ( refer to b) ). 88 your profile name ( refer to b) ).
88d) Coose the profile kind of your syncing method: 89d) Coose the profile kind of your syncing method:
89 (i) Local file or 90 (i) Local file or
90 (ii) Pi-Sync or 91 (ii) Pi-Sync or
91 (iii) Remote file or 92 (iii) Remote file or
92 (iiii) Mobile Phone. 93 (iiii) Mobile Phone.
93 Detailed explanation in 5) 94 Detailed explanation in 6)
94e) Choose the other profile options. 95e) Choose the other profile options.
95 Detailed explanation in 2) 96 Detailed explanation in 2)
96f) Close sync dialog with OK. 97f) Close sync dialog with OK.
97g) Sync. 98g) Sync.
98 99
99NOTE: 100NOTE:
100AFTER SYNCING THERE ARE "SYNC EVENTS" CREATED 101AFTER SYNCING THERE ARE "SYNC EVENTS" CREATED
101(OR UPDATED, IF IT ALREADY EXITS) FOR EACH SYNC PROFILE. 102(OR UPDATED, IF IT ALREADY EXITS) FOR EACH SYNC PROFILE.
102YOU MAY NOT DELETE OR CHANGE THESE EVENTS. 103YOU MAY NOT DELETE OR CHANGE THESE EVENTS.
103 104
104************************************************************************* 105*************************************************************************
1052) Sync settings in sync dialog 1062) Sync settings in sync dialog
106************************************************************************* 107*************************************************************************
107 108
108a) Local device name: 109a) Local device name:
109 -> 1) b) 110 -> 1) b)
110b) Profile: 111b) Profile:
111 -> 1) c) 112 -> 1) c)
112c) Include in multiple sync: 113c) Multiple Sync options: Include in multiple sync:
113 In the Synchronize menu, there is a multiple sync menu entry. 114 In the Synchronize menu, there is a multiple sync menu entry.
114 If you choose this menu entry, all user defined profiles with this 115 If you choose this menu entry, all user defined profiles with this
115 'Include in multiple sync' option enabled will be synced 116 'Include in multiple sync' option enabled will be synced
116 one after another. And this twice. This will take some time. 117 one after another. And this twice. This will take some time.
117 After that sync, on all devices should be the same data. 118 After that sync, on all devices should be the same data.
119
120d)- j) Sync algo options:
121
118d) Ask for preferences before sync: 122d) Ask for preferences before sync:
119 Check this to be asked for sync preferences settings before each sync. 123 Check this to be asked for "Sync preferences" settings before each sync.
120 If the profile kind is "Pi-Sync" you will be asked to confirm 124 If the profile kind is "Pi-Sync" you will be asked to confirm
121 the "Pi-Sync" specific settings (Password,IP address, port number) 125 the "Pi-Sync" specific settings (Password,IP address, port number)
122 as well. That makes it possible to use that profile for a 126 as well. That makes it possible to use that profile for a
123 device that is connected via DHCP to the network and gets different 127 device that is connected via DHCP to the network and gets different
124 IP addresses when connection to the network. 128 IP addresses when connecting to the network.
125e) Sync preferences: 129e) Sync preferences:
126 Choose here your sync preferences. 130 Choose here your sync preferences.
127 Details -> 4) 131 Details -> 4)
128f) Show summary after sync: 132f) Show summary after sync:
129 Check this to get a small summary dialog after sync 133 Check this to get a small summary dialog after sync
130 about number of added/changed/deleted events on local/remote. 134 about number of added/changed/deleted events on local/remote.
135g) Apply filter when adding data to local:
136 What is a filter? You can read this in -> 5)
137 With this option you can specify a filter for events/contacts,
138 which should be added to the local database, because they are
139 in the remote database and not in the local database.
140 (Database = calendar file or addressbook file).
141 Note that the filter is NOT applied to the remote
142 database before syncing. It is only applied to a particular
143 item which should be added to the local database.
144 Well, but what is the difference?
145 The differnce is: If the remote database AND the local database contain
146 an already synced item, which does not match the filter, then this item is synced.
147 If the remote database contains an item which does not match the filter
148 and the local database does not contain this item, then this item is not added
149 to the local database, but it is still in the remote database after syncing.
131g) Write back synced data: 150g) Write back synced data:
132 Uncheck this to update the local calendar only. 151 Uncheck this to update the local calendar only.
133 I.e. your local calendar is synced with the remote calendar 152 I.e. your local calendar is synced with the remote calendar
134 but nothing on the remote calendar is changed. 153 but nothing on the remote calendar is changed.
135 If you uncheck "Write back synced data", the settings 154 If you uncheck "Write back synced data", the settings
136 under h) and i) are ignored, of course. 155 under h) and i) are ignored, of course.
137h) --Write back (on remote) existing entries only: 156
157h) - j) Write back options:
158
159h) Write back (on remote) existing entries only:
138 Check this to update the remote data only. 160 Check this to update the remote data only.
139 I.e. no data from yor local calendar/addressbook is added to the 161 I.e. no data from yor local calendar/addressbook is added to the
140 remote device. You may use this option to 162 remote device. You may use this option to
141 sync against some kind of "public calendar/addressbook" without 163 sync against some kind of "public calendar/addressbook" without
142 writing back your personal data. 164 adding anything of your personal data.
143i) --Write back (calendar) entries in future only: 165 But in this case, you cannot add an item to the remoet device.
144 Check this to write back only calendar entries in future. 166i) Apply filter when adding data to remote:
167 What is a filter? You can read this in -> 5)
168 With this option you can specify a filter for events/contacts,
169 which should be added to the remote database, because they are
170 in the local database and not in the remote database.
171 (Database = calendar file or addressbook file).
172 Note that the filter is NOT applied to the local
173 database before syncing. It is only applied to a particular
174 item of the local database which should be added to the remote database.
175 Well, but what is the difference?
176 The differnce is: If the local database AND the remote database contain
177 an already synced item, which does not match the filter, then this item is synced.
178 If the local database contains an item which does not match the filter
179 and the remote database does not contain this item, then this item is not added
180 to the remote database, but it is still in the local database after syncing.
181 Example:
182 You have specified a calendar filter "only public events".
183 You specify this filter as the outgoing filter for syncing.
184 If there is an event in the local database which is not "public", but "private",
185 this event is not added to the remote database.
186 If there is an event in the local database and in the remote database which is
187 "private" (maybe added by someone else) then this event is synced and
188 it is in the local database and in the remote database after syncing.
189 That means in particular you cannot remove an event from the remote
190 database but setting it to "private".
191 If you want to remove the event you can clone it, set it to private and delete the
192 original event. Then the original event is deleted in the remote database after sync and
193 the cloned event is not added to the remote database, because it is private.
194j) Write back (calendar) entries for time period only:
195 Check this to write back only calendar entries for a given time period.
145 (Useful when syncing with mobile phones.) 196 (Useful when syncing with mobile phones.)
146 You can specify the date range in weeks with 197 You can specify the date range in weeks for the weeks in the past to the weeks in the future.
147 ---- Max. weeks in future. 198
148 Note: The date range starts always 7 days before the actual date! 199k) Profile kind:
149 I.e. the calendar events of the last week are written back always. 200 Details -> 6)
150j) Profile kind:
151 Details -> 5)
152 201
153************************************************************************* 202*************************************************************************
1543) Syncing background 2033) Syncing background
155************************************************************************* 204*************************************************************************
156 205
157The same mentioned for calendars is valid for addressbooks as well. 206The same mentioned for calendars is valid for addressbooks as well.
158 207
159Synchronizing calendars ( i.e. files ) means, 208Synchronizing calendars ( i.e. files ) means,
160to merge two calendars in a useful way. 209to merge two calendars in a useful way.
161If the two calendars are completely different, 210If the two calendars are completely different,
162there is no problem, the resulting calendar contains 211there is no problem, the resulting calendar contains
163all data from the local and from the remote calendar. 212all data from the local and from the remote calendar.
164 213
165Problems will occur, if you have edited items 214Problems will occur, if you have edited items
166from the local calendar on the remote machine. 215from the local calendar on the remote machine.
167Then it could be, that items are in conflict. 216Then it could be, that items are in conflict.
168Two items are "in conflict", if they have the 217Two items are "in conflict", if they have the
169same unique ID (which get an item at time of 218same unique ID (which get an item at time of
170creation and owns it until it is deleted ) 219creation and owns it until it is deleted )
171and they both are modified after the last 220and they both are modified after the last
172synchronization. 221synchronization.
173 222
174At first sync of two calendars there is no item deleted. 223At first sync of two calendars there is no item deleted.
175If the calendars are synced before and there is an item, 224If the calendars are synced before and there is an item,
176which is not edited after the last sync and is only 225which is not edited after the last sync and is only
177available in one calendar, then this item is deleted 226available in one calendar, then this item is deleted
178in this calendar. 227in this calendar.
179 228
180But when was the last synchronization between two calendars? 229But when was the last synchronization between two calendars?
181 230
182To know that, KO/Pi creates at first syncing 231To know that, KO/Pi creates at first syncing
183of two files an unique event "<profile name> - sync Event" 232of two files an unique event "<profile name> - sync Event"
184on the remote and the local calendar. 233on the remote and the local calendar.
185After syncing, the start time of this event is set 234After syncing, the start time of this event is set
186to the time of syncing. 235to the time of syncing.
187The event is read only and the user may not change it. 236The event is read only and the user may not change it.
188 237
189If two such files are synced, that both have an event 238If two such files are synced, that both have an event
190"<profile name> - sync Event" and the events have 239"<profile name> - sync Event" and the events have
191the same start time, then deleted items on the one calendar 240the same start time, then deleted items on the one calendar
192are deleted on the other as well. 241are deleted on the other as well.
193 242
194 243
195************************************************************************* 244*************************************************************************
1964) Sync preferences 2454) Sync preferences
197************************************************************************* 246*************************************************************************
198 247
199Two items are "in conflict", if they have the same unique ID 248Two items are "in conflict", if they have the same unique ID
200and they both are modified after the last synchronization. 249and they both are modified after the last synchronization.
201(Details -> 3) ). 250(Details -> 3) ).
202 251
203If an item is not modified after the last sync and 252If an item is not modified after the last sync and
204it is not found in the other calendar, it is deleted. 253it is not found in the other calendar, it is deleted.
205 254
206On the first sync, there is no item deleted. 255On the first sync, there is no item deleted.
207 256
208SYNC PREFERENCES: 257SYNC PREFERENCES:
209 -Take local entry on conflict: 258 -Take local entry on conflict:
210 Takes the local entry on conflict. 259 Takes the local entry on conflict.
211 If it is the first sync, 260 If it is the first sync,
212 "Ask for every entry" 261 "Ask for every entry"
213 is chosen automatically, 262 is chosen automatically,
214 if this is selected. 263 if this is selected.
215 264
216 -Take remote entry on conflict: 265 -Take remote entry on conflict:
217 Takes the remote entry on conflict. 266 Takes the remote entry on conflict.
218 If it is the first sync, 267 If it is the first sync,
219 "Ask for every entry" 268 "Ask for every entry"
220 is chosen automatically, 269 is chosen automatically,
221 if this is selected. 270 if this is selected.
222 271
223 -Take newest entry on conflict: 272 -Take newest entry on conflict:
224 This takes the newest entry on conflict. 273 This takes the newest entry on conflict.
225 May be the most useful syncing mode. 274 May be the most useful syncing mode.
226 275
227 -Ask for every entry on conflict: 276 -Ask for every entry on conflict:
228 Pops up an event viewer dialog and 277 Pops up an event viewer dialog and
229 shows the two conflicting entries there. 278 shows the two conflicting entries there.
230 The user can chose, which entry he would like to take. 279 The user can chose, which entry he would like to take.
231 The button for the newest entry 280 The button for the newest entry
232 is automatically set as default button. 281 is automatically set as default button.
233 The color for the newest entry is green. 282 The color for the newest entry is green.
234 283
235 -Force: Take local entry always: 284 -Force: Take local entry always:
236 Even if the calendars are already synced 285 Even if the calendars are already synced
237 there is no item deleted on local. 286 there is no item deleted on local.
238 287
239 -Force: Take remote entry always: 288 -Force: Take remote entry always:
240 Analogous to 289 Analogous to
241 "Force: Take local entry always" 290 "Force: Take local entry always"
242 291
243************************************************************************* 292*************************************************************************
2445) Details about sync profile kinds 2935) How a filter works
294*************************************************************************
295
296A filter is a rule to decide if a particular item
297(calendar iten item or contact item) belongs to a set of items.
298For example, you can specify a set as:
299Only items, that belongs to that category.
300Or: Only items, that does not belong to that category.
301Or: Only items, that are public.
302
303If you specify a filter in a syncing profile, you can set the
304rules of adding items to the local or remote database.
305
306Example:
307You have a public calendar in your company, which contains all
308company relevant data.
309
310You have different projects in the company and for project specific events
311is always set the project name as a category:
312E.g. all events of the project PRO_ABC do have set the categorie PRO_ABC.
313But you are not interested in events of PRO_ABC, because you are not working on it.
314Then you can specify a filter: All, but not with categoroy PRO_ABC.
315When you specify this filter as an incoming filter for your sync profile,
316all events of the company are synced and added to your local calendar, but not
317the evenst of the project PRO_ABC.
318
319You do not want that your private data can be seen
320in the public calendar of your company.
321Well, set the property to "private" for all your private data
322and specify an outgoing filter: Only " public" and "confidential".
323Then you can sync your personal calendar with the calendar of the company,
324but your private data is not added to the public calendar.
325
326*************************************************************************
3276) Details about sync profile kinds
245************************************************************************* 328*************************************************************************
246 329
247a) Local file 330a) Local file
248 Please specify a local file you want to sync with. 331 Please specify a local file you want to sync with.
249 Note: If you are syncing a file, which is used by KA/Pi, please check the 332 Note: If you are syncing a file, which is used by KA/Pi, please check the
250 "Addressbook file (*.vcf) is used by KA/Pi". 333 "Addressbook file (*.vcf) is used by KA/Pi".
251 If you are syncing with a file from KAddressbook or another program, 334 If you are syncing with a file from KAddressbook or another program,
252 please uncheck "Addressbook file (*.vcf) is used by KA/Pi". 335 please uncheck "Addressbook file (*.vcf) is used by KA/Pi".
253 To set this properly is important! KA/Pi uses a "last modified" property, 336 To set this properly is important! KA/Pi uses a "last modified" property,
254 which is not supported by KAddressbook. 337 which is not supported by KAddressbook.
255 338
256b) Pi-Sync (direct Kx/Pi to Kx/Pi sync) 339b) Pi-Sync (direct Kx/Pi to Kx/Pi sync)
257 We mention here only KO/Pi, but the same is valid for KA/Pi. 340 We mention here only KO/Pi, but the same is valid for KA/Pi.
258 If you want to sync with a device, where KO/Pi is 341 If you want to sync with a device, where KO/Pi is
259 installed, you can easily get the remote file via network 342 installed, you can easily get the remote file via network
260 with the build in file transfer feature "Pi-Sync": 343 with the build in file transfer feature "Pi-Sync":
261 You have first to enable file transfer on the remote device: 344 You have first to enable file transfer on the remote device:
262 - Start KO/Pi on the remote device. 345 - Start KO/Pi on the remote device.
263 - Choose Menu Synchronize-Enable Pi-Sync. 346 - Choose Menu Synchronize-Enable Pi-Sync.
264 - Choose a port number, where KO/Pi should listen for 347 - Choose a port number, where KO/Pi should listen for
265 file sending requests. Valid port numbers are numbers 348 file sending requests. Valid port numbers are numbers
266 between 1 and 65565. Do not specify port numbers, that are 349 between 1 and 65565. Do not specify port numbers, that are
267 used by other applications. A port number between 9000 and 9999 350 used by other applications. A port number between 9000 and 9999
268 is most likely not used by another application. 351 is most likely not used by another application.
269 The default port number is 9197 for KO/Pi. 352 The default port number is 9197 for KO/Pi.
270 If you specify a port number, which is already in use, 353 If you specify a port number, which is already in use,
271 you will get an error message when closing this dialog. 354 you will get an error message when closing this dialog.
272 - Choose a password. 355 - Choose a password.
273 - Click OK. 356 - Click OK.
274 Now KO/Pi will send the calendar data via the network, 357 Now KO/Pi will send the calendar data via the network,
275 if some other device is sending a "please send calendar" 358 if some other device is sending a "please send calendar"
276 request on the given port using the given password. 359 request on the given port using the given password.
277 If you want to be sure, nobody can access your calendar 360 If you want to be sure, nobody can access your calendar
278 data, simply disable the file transfer feature on the 361 data, simply disable the file transfer feature on the
279 remote device after the syncing is done by choosing: 362 remote device after the syncing is done by choosing:
280 Menu Synchronize-Disable Pi-Sync. 363 Menu Synchronize-Disable Pi-Sync.
281 364
282 Note: If you want to sync with a remote device that gets different 365 Note: If you want to sync with a remote device that gets different
283 IPaddresses each time connected to the network 366 IPaddresses each time connected to the network
284 (this may be the case, if you use DHCP for connection 367 (this may be the case, if you use DHCP for connection
285 of the remote device to the network) simply enable 368 of the remote device to the network) simply enable
286 "Ask for preferences before sync". 369 "Ask for preferences before sync".
287 Then you will be asked to confirm the 370 Then you will be asked to confirm the
288 "Pi-Sync" specific settings 371 "Pi-Sync" specific settings
289 (Password,IP address, port number) 372 (Password,IP address, port number)
290 and you can easily change the IP address before each sync. 373 and you can easily change the IP address before each sync.
291 374
292 On your local device, create a new profile and choose 375 On your local device, create a new profile and choose
293 profile kind "Pi-Sync". 376 profile kind "Pi-Sync".
294 Fill in the needed values: 377 Fill in the needed values:
295 - Password for remote access: 378 - Password for remote access:
296 The password you specified on the remote device. 379 The password you specified on the remote device.
297 - Remote IP address: 380 - Remote IP address:
298 The IP address of the remote device. 381 The IP address of the remote device.
299 - Remote port number: 382 - Remote port number:
300 The port number you specified on the remote device. 383 The port number you specified on the remote device.
301 384
302 Now you can syncronize your local device easily with your 385 Now you can syncronize your local device easily with your
303 remote device. This works well for all platforms KO/Pi is 386 remote device. This works well for all platforms KO/Pi is
304 running on, e.g. syncing a KO/Pi on Zaurus with KO/Pi on Windows 387 running on, e.g. syncing a KO/Pi on Zaurus with KO/Pi on Windows
305 is now very easy. 388 is now very easy.
306 389
307c) Remote file 390c) Remote file
308 Note: If you are syncing a file, which is used by KA/Pi, please check the 391 Note: If you are syncing a file, which is used by KA/Pi, please check the
309 "Addressbook file (*.vcf) is used by KA/Pi". 392 "Addressbook file (*.vcf) is used by KA/Pi".
310 If you are syncing with a file from KAddressbook or another program, 393 If you are syncing with a file from KAddressbook or another program,
311 please uncheck "Addressbook file (*.vcf) is used by KA/Pi". 394 please uncheck "Addressbook file (*.vcf) is used by KA/Pi".
312 To set this properly is important! KA/Pi uses a "last modified" property, 395 To set this properly is important! KA/Pi uses a "last modified" property,
313 which is not supported by KAddressbook. 396 which is not supported by KAddressbook.
314 397
315 Syncing with the profile kind "Remote file" is performed in three steps: 398 Syncing with the profile kind "Remote file" is performed in three steps:
316 i) download the remote file to your local machine to a temp file 399 i) download the remote file to your local machine to a temp file
317 ii) sync with this temp file 400 ii) sync with this temp file
318 iii) upload the synced file to the remote device 401 iii) upload the synced file to the remote device
319 402
320 The down-/uploading if i) and iii) is done via a command line command. 403 The down-/uploading if i) and iii) is done via a command line command.
321 Please specify the download/upload command ( like scp, ftp, ...) and the 404 Please specify the download/upload command ( like scp, ftp, ...) and the
322 file name of the temp file in the corresponding fields. 405 file name of the temp file in the corresponding fields.
323 406
324d) Mobile device (cell phone) 407d) Mobile device (cell phone)
325 Note: On the Zaurus you have to install the phoneaccess_xxx_arm.ipk package 408 Note: On the Zaurus you have to install the phoneaccess_xxx_arm.ipk package
326 to be able to access mobile phones. 409 to be able to access mobile phones.
327 We mention here only KO/Pi, but the same is valid for KA/Pi. 410 We mention here only KO/Pi, but the same is valid for KA/Pi.
328 Note: 411 Note:
329 It is only possible to sync a mobile phone with one particular device 412 It is only possible to sync a mobile phone with one particular device
330 running KO/Pi. If you want to be able to write data of more than one device 413 running KO/Pi. If you want to be able to write data of more than one device
331 to the mobile phone (e.g. from your Zaurus and from your Windows Laptop) 414 to the mobile phone (e.g. from your Zaurus and from your Windows Laptop)
332 do not sync with the mobile phone at all, but use the 415 do not sync with the mobile phone at all, but use the
333 "Export to phone" functionality from the different devices. 416 "Export to phone" functionality from the different devices.
334 Using "Export to phone" makes it not possible to get back data from the 417 Using "Export to phone" makes it not possible to get back data from the
335 phone, if it was changed there, of course. 418 phone, if it was changed there, of course.
336 If you sync with the phone, do not use "Export to phone" from any device. 419 If you sync with the phone, do not use "Export to phone" from any device.
337 (And do not sync, as mentioned above, from any other device with that phone). 420 (And do not sync, as mentioned above, from any other device with that phone).
338 It would delete the needed information for syncing with that phone! 421 It would delete the needed information for syncing with that phone!
339 422
340 We are using Gammu (Version: 0.98.9) ( http://freshmeat.net/projects/gammu/ ) 423 We are using Gammu (Version: 0.98.9) ( http://freshmeat.net/projects/gammu/ )
diff --git a/version b/version
index d8563ed..e1d5bc3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "1.9.17"; version = "1.9.18";