Added debian extra dependency packages.

Signed-off-by: Michele Calgaro <[email protected]>

294 files changed, 3139 insertions, 0 deletions

diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/anchor.db b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/anchor.db
new file mode 100644
index 00000000..612b966c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/anchor.db
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/file-sync.conf
new file mode 100644
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/hash.db b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/hash.db
new file mode 100644
index 00000000..2b6682f1
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/hash.db
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/syncmember.conf
new file mode 100644
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/file-sync.conf
new file mode 100644
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/hash.db b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/hash.db
new file mode 100644
index 00000000..216537f8
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/hash.db
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/syncmember.conf
new file mode 100644
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/change.db b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/change.db
new file mode 100644
index 00000000..8e09854a
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/change.db
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/syncgroup.conf
new file mode 100644
index 00000000..481b4dee
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><filter><destobjtype>data</destobjtype><action>1</action></filter><groupname>kdefile</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/data1/file b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/data1/file
new file mode 100644
index 00000000..d383c56f
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/data1/file
@@ -0,0 +1 @@
+testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/data1/file2 b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/data1/file2
new file mode 100644
index 00000000..00b728c3
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/destobjtype_delete/data1/file2
@@ -0,0 +1 @@
+testedata2
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_save_and_load/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_setup/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/data1/testdata b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/data2/testdata2 b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/data2/testdata2
new file mode 100644
index 00000000..f18b75a6
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_custom/data2/testdata2
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/data1/testdata b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/data2/testdata2 b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/data2/testdata2
new file mode 100644
index 00000000..f18b75a6
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_deny_all/data2/testdata2
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/testdata b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/testdata2 b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/testdata2
new file mode 100644
index 00000000..f18b75a6
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/testdata2
diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/vcard.vcf b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/vcard.vcf
new file mode 100644
index 00000000..91e01190
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data1/vcard.vcf
@@ -0,0 +1,11 @@
+BEGIN:VCARD

+VERSION:2.1

+X-EVOLUTION-FILE-AS:Multisync

+FN:Multisync

+N:;Multisync

+EMAIL;INTERNET:[email protected]

+X-EVOLUTION-LAST-USE:2003-11-26

+X-EVOLUTION-USE-SCORE:5.891888

+UID:pas-id-3F1D9AC000000001

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data2/testdata3 b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data2/testdata3
new file mode 100644
index 00000000..88b7bc39
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/filter_sync_vcard_only/data2/testdata3
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/3/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/3/file-sync.conf
new file mode 100755
index 00000000..c5990aa2
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/3/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data3</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/3/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/3/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/3/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/data1/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/newdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/newdata
new file mode 100644
index 00000000..e7dde4c8
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/newdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/newdata2 b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/newdata2
new file mode 100644
index 00000000..61628870
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_changetype_choose/newdata2
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/3/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/3/file-sync.conf
new file mode 100755
index 00000000..c5990aa2
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/3/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data3</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/3/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/3/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/3/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/data1/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/data2/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/data2/testdata
new file mode 100644
index 00000000..1ba3e340
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/3/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/3/file-sync.conf
new file mode 100755
index 00000000..c5990aa2
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/3/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data3</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/3/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/3/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/3/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data1/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data2/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data2/testdata
new file mode 100644
index 00000000..1ba3e340
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data3/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data3/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_choose2/data3/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/3/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/3/file-sync.conf
new file mode 100755
index 00000000..c5990aa2
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/3/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data3</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/3/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/3/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/3/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data1/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data2/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data2/testdata
new file mode 100644
index 00000000..e7dde4c8
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data3/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data3/testdata
new file mode 100644
index 00000000..61628870
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_conflict_data_duplicate2/data3/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/3/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/3/file-sync.conf
new file mode 100755
index 00000000..c5990aa2
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/3/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data3</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/3/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/3/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/3/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/data1/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata
new file mode 100644
index 00000000..30895eae
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata1 b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata1
new file mode 100644
index 00000000..9b4118f8
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata1
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata2 b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata2
new file mode 100644
index 00000000..05758207
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata2
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata3 b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata3
new file mode 100644
index 00000000..a4a7f801
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata3
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata4 b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata4
new file mode 100644
index 00000000..93627682
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata4
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata5 b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata5
new file mode 100644
index 00000000..72091685
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new/newdata5
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/3/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/3/file-sync.conf
new file mode 100755
index 00000000..c5990aa2
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/3/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data3</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/3/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/3/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/3/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/data1/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/data2/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/data2/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/3/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/3/file-sync.conf
new file mode 100755
index 00000000..c5990aa2
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/3/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data3</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/3/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/3/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/3/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data1/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data2/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data2/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data3/testdata b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data3/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/multisync_easy_new_partial2/data3/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/plugin_no_config/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_deldel/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data2/testdata b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data2/testdata
new file mode 100755
index 00000000..5425b0f7
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data2/testdata-dupe b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data2/testdata-dupe
new file mode 100644
index 00000000..a63f373f
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate/data2/testdata-dupe
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/comp_data/testdata b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/comp_data/testdata
new file mode 100755
index 00000000..5425b0f7
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/comp_data/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/new_data b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/new_data
new file mode 100755
index 00000000..5425b0f7
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_conflict_duplicate2/new_data
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/comp_data/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/comp_data/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/comp_data/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/data2/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/data2/testdata
new file mode 100755
index 00000000..5425b0f7
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/comp_data/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/comp_data/testdata
new file mode 100755
index 00000000..5425b0f7
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/comp_data/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/comp_data/testdata-dupe b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/comp_data/testdata-dupe
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/comp_data/testdata-dupe
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/data2/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/data2/testdata
new file mode 100755
index 00000000..5425b0f7
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_conflict_duplicate/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/data1/testdata2 b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/data1/testdata2
new file mode 100644
index 00000000..451ac613
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_dualdel/data1/testdata2
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_del/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/data2/testdata b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/data2/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_easy_new_mapping/data2/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_init_error/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_moddel/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_moddel/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_moddel/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_moddel/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_moddel/new_data1 b/debian/opensync/opensync-0.22/tests/data/sync_moddel/new_data1
new file mode 100644
index 00000000..5746e52f
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_moddel/new_data1
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_moddel/new_data2 b/debian/opensync/opensync-0.22/tests/data/sync_moddel/new_data2
new file mode 100644
index 00000000..3b307bf6
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_moddel/new_data2
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_connect/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d33471ac
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>fileasd-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_false/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..e6faad33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..012e6018
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>FALSE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_setup_init/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/1/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/1/file-sync.conf
new file mode 100755
index 00000000..bf6ca0a3
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/1/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data1</path><recursive>TRUE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/1/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/1/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/1/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/2/file-sync.conf b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/2/file-sync.conf
new file mode 100755
index 00000000..896463d4
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/2/file-sync.conf
@@ -0,0 +1 @@
+<config><path>data2</path><recursive>TRUE</recursive></config>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/2/syncmember.conf b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/2/syncmember.conf
new file mode 100755
index 00000000..d7b13aeb
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/2/syncmember.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncmember><pluginname>file-sync</pluginname></syncmember>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/syncgroup.conf b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/syncgroup.conf
new file mode 100755
index 00000000..9629035c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/configs/group/syncgroup.conf
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<syncgroup><groupname>test</groupname></syncgroup>
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data1/subdir/testdata1 b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data1/subdir/testdata1
new file mode 100644
index 00000000..30895eae
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data1/subdir/testdata1
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data1/testdata b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data1/testdata
new file mode 100755
index 00000000..61e1fc33
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data1/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data2/subdir/testdata b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data2/subdir/testdata
new file mode 100644
index 00000000..05758207
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/sync_subdirs_new/data2/subdir/testdata
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-conflict.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-conflict.vcf
new file mode 100644
index 00000000..5f31aec9
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-conflict.vcf
@@ -0,0 +1,22 @@
+BEGIN:VCARD

+VERSION:3.0

+URL:

+TITLE:

+ROLE:

+X-EVOLUTION-MANAGER:

+X-EVOLUTION-ASSISTANT:

+NICKNAME:

+X-EVOLUTION-SPOUSE:

+NOTE:

+FN:samename

+N:samename;;;;

+X-EVOLUTION-FILE-AS:1-conflict

+X-EVOLUTION-BLOG-URL:

+CALURI:

+FBURL:

+X-EVOLUTION-VIDEO-URL:

+X-MOZILLA-HTML:FALSE

+UID:pas-id-4220B54B00000006

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:evo2mail

+TEL;TYPE=WORK;TYPE=VOICE;X-EVOLUTION-UI-SLOT=1:samephone

+END:VCARD

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-different.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-different.vcf
new file mode 100644
index 00000000..6f1fc1c8
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-different.vcf
@@ -0,0 +1,20 @@
+BEGIN:VCARD

+VERSION:3.0

+URL:

+TITLE:

+ROLE:

+X-EVOLUTION-MANAGER:

+X-EVOLUTION-ASSISTANT:

+NICKNAME:

+X-EVOLUTION-SPOUSE:

+NOTE:

+FN:evo2name

+N:;evo2name;;;

+X-EVOLUTION-FILE-AS:1-different

+X-EVOLUTION-BLOG-URL:

+CALURI:

+FBURL:

+X-EVOLUTION-VIDEO-URL:

+X-MOZILLA-HTML:FALSE

+UID:pas-id-4220B4EE00000003

+END:VCARD
\ No newline at end of file
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-same.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-same.vcf
new file mode 100644
index 00000000..79a37918
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/1-same.vcf
@@ -0,0 +1,22 @@
+BEGIN:VCARD

+VERSION:3.0

+URL:samehomepage

+TITLE:

+ROLE:

+X-EVOLUTION-MANAGER:

+X-EVOLUTION-ASSISTANT:

+NICKNAME:

+X-EVOLUTION-SPOUSE:

+NOTE:

+FN:samename

+N:samename;;;;

+X-EVOLUTION-FILE-AS:1-same

+X-EVOLUTION-BLOG-URL:

+CALURI:

+FBURL:

+X-EVOLUTION-VIDEO-URL:

+X-MOZILLA-HTML:FALSE

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:samemail

+TEL;TYPE=WORK;TYPE=VOICE;X-EVOLUTION-UI-SLOT=1:samephone

+UID:pas-id-4220B62E0000000B

+END:VCARD

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-conflict.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-conflict.vcf
new file mode 100644
index 00000000..5103a601
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-conflict.vcf
@@ -0,0 +1,25 @@
+BEGIN:VCARD

+VERSION:3.0

+URL:

+TITLE:

+ROLE:

+X-EVOLUTION-MANAGER:

+X-EVOLUTION-ASSISTANT:

+NICKNAME:

+X-EVOLUTION-SPOUSE:

+NOTE:

+FN:evo2name

+N:;evo2name;;;

+X-EVOLUTION-FILE-AS:2-conflict

+X-EVOLUTION-BLOG-URL:

+CALURI:

+FBURL:

+X-EVOLUTION-VIDEO-URL:

+X-MOZILLA-HTML:FALSE

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:samemail

+TEL;TYPE=WORK;TYPE=VOICE;X-EVOLUTION-UI-SLOT=1:samephone

+TEL;TYPE=HOME;TYPE=VOICE;X-EVOLUTION-UI-SLOT=2:samephone2

+ADR;TYPE=HOME:;;sameaddress;;;;

+LABEL;TYPE=HOME:sameaddress

+UID:pas-id-4220B5C300000008

+END:VCARD
\ No newline at end of file
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-different.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-different.vcf
new file mode 100644
index 00000000..52b32590
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-different.vcf
@@ -0,0 +1,23 @@
+BEGIN:VCARD

+VERSION:3.0

+URL:

+TITLE:

+ROLE:

+X-EVOLUTION-MANAGER:

+X-EVOLUTION-ASSISTANT:

+NICKNAME:

+X-EVOLUTION-SPOUSE:

+NOTE:

+FN:samename

+N:samename;;;;

+X-EVOLUTION-FILE-AS:2-different

+X-EVOLUTION-BLOG-URL:

+CALURI:

+FBURL:

+X-EVOLUTION-VIDEO-URL:

+X-MOZILLA-HTML:FALSE

+TEL;TYPE=WORK;TYPE=VOICE;X-EVOLUTION-UI-SLOT=1:evo2phone

+ADR;TYPE=HOME:;;evo2address;;;;

+LABEL;TYPE=HOME:evo2address

+UID:pas-id-4220B53200000004

+END:VCARD

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-same.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-same.vcf
new file mode 100644
index 00000000..66d707bc
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/compare/2-same.vcf
@@ -0,0 +1,21 @@
+BEGIN:VCARD

+VERSION:3.0

+URL:

+TITLE:

+ROLE:

+X-EVOLUTION-MANAGER:

+X-EVOLUTION-ASSISTANT:

+NICKNAME:samenick

+X-EVOLUTION-SPOUSE:

+NOTE:

+FN:samename

+N:samename;;;;

+X-EVOLUTION-FILE-AS:2-same

+X-EVOLUTION-BLOG-URL:

+CALURI:

+FBURL:

+X-EVOLUTION-VIDEO-URL:

+X-MOZILLA-HTML:FALSE

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:samemail

+UID:pas-id-4220B62F0000000C

+END:VCARD

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-full1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-full1.vcf
new file mode 100644
index 00000000..c1807996
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-full1.vcf
@@ -0,0 +1,47 @@
+BEGIN:VCARD

+VERSION:3.0

+FN:Title First Middle Last Suffix

+N:Last;First;Middle;Title;Suffix

+ORG:organization;department;office

+REV:2005-02-26T10:41:24Z

+ROLE:profession

+TITLE:title

+UID:pas-id-421A5F6100000014

+URL:homepage

+X-EVOLUTION-FILE-AS:Last\, First

+X-EVOLUTION-MANAGER:manager

+X-EVOLUTION-ASSISTANT:assistant

+NICKNAME:nickname

+BDAY:2005-02-10

+X-EVOLUTION-ANNIVERSARY:2005-02-08

+X-EVOLUTION-SPOUSE:spouse

+NOTE:This is a note!

+CATEGORIES:Birthday,Business

+X-EVOLUTION-BLOG-URL:weblog

+CALURI:calendar

+FBURL:freebusy

+X-EVOLUTION-VIDEO-URL:video chat

+X-MOZILLA-HTML:TRUE

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:workemail

+EMAIL;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:homeemail

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=3:otheremail

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=4:otheremail2

+TEL;TYPE=WORK;TYPE=VOICE;X-EVOLUTION-UI-SLOT=1:bizphone

+TEL;TYPE=HOME;TYPE=VOICE;X-EVOLUTION-UI-SLOT=2:homephone

+TEL;TYPE=CELL;X-EVOLUTION-UI-SLOT=3:mobphone

+TEL;TYPE=WORK;TYPE=FAX;X-EVOLUTION-UI-SLOT=4:biz fax

+TEL;TYPE="X-EVOLUTION-ASSISTANT";X-EVOLUTION-UI-SLOT=5:assistantphone

+TEL;TYPE="X-EVOLUTION-CALLBACK";X-EVOLUTION-UI-SLOT=6:callback

+TEL;TYPE=CAR;X-EVOLUTION-UI-SLOT=7:car phone

+TEL;TYPE=PREF;X-EVOLUTION-UI-SLOT=8:primary phone

+X-AIM;TYPE=HOME;X-EVOLUTION-UI-SLOT=1:aim

+X-YAHOO;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:yahoo

+X-ICQ;TYPE=HOME;X-EVOLUTION-UI-SLOT=3:icq

+X-GROUPWISE;TYPE=HOME;X-EVOLUTION-UI-SLOT=4:groupwise

+ADR;TYPE=WORK:PO-BOX2;;Address2;City2;State2;zip2;country2

+LABEL;TYPE=WORK:Address2\nCity2\, State2\nzip2\nPO-BOX2\ncountry2

+ADR;TYPE=HOME:PO-BOX1;;Address1;City1;State1;zip1;country1

+LABEL;TYPE=HOME:Address1\nCity1\, State1\nzip1\nPO-BOX1\ncountry1

+ADR;TYPE=OTHER:PO-BOX3;;Address3;City3;State3;zip3;country3

+LABEL;TYPE=OTHER:Address3\nCity3\, State3\nzip3\nPO-BOX3\ncountry3

+END:VCARD
\ No newline at end of file
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-full2.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-full2.vcf
new file mode 100644
index 00000000..b3f9a609
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-full2.vcf
@@ -0,0 +1,47 @@
+BEGIN:VCARD

+VERSION:3.0

+FN:Title First Middle Last Suffix

+N:Last;First;Middle;Title;Suffix

+ORG:organization;department;office

+REV:2005-02-26

+ROLE:profession

+TITLE:title

+UID:pas-id-421A5F6100000014

+URL:homepage

+X-EVOLUTION-FILE-AS:Last\, First

+X-EVOLUTION-MANAGER:manager

+X-EVOLUTION-ASSISTANT:assistant

+NICKNAME:nickname

+BDAY:2005-02-10

+X-EVOLUTION-ANNIVERSARY:2005-02-08

+X-EVOLUTION-SPOUSE:spouse

+NOTE:This is a note!

+CATEGORIES:Birthday,Business

+X-EVOLUTION-BLOG-URL:weblog

+CALURI:calendar

+FBURL:freebusy

+X-EVOLUTION-VIDEO-URL:video chat

+X-MOZILLA-HTML:TRUE

+ADR;TYPE=WORK:PO-BOX2;;Address2;City2;State2;zip2;country2

+LABEL;TYPE=WORK:Address2\nCity2\, State2\nzip2\nPO-BOX2\ncountry2

+ADR;TYPE=HOME:PO-BOX1;;Address1;City1;State1;zip1;country1

+LABEL;TYPE=HOME:Address1\nCity1\, State1\nzip1\nPO-BOX1\ncountry1

+ADR;TYPE=OTHER:PO-BOX3;;Address3;City3;State3;zip3;country3

+LABEL;TYPE=OTHER:Address3\nCity3\, State3\nzip3\nPO-BOX3\ncountry3

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:workemail

+EMAIL;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:homeemail

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=3:otheremail

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=4:otheremail2

+TEL;TYPE="X-EVOLUTION-COMPANY";X-EVOLUTION-UI-SLOT=1:company phone

+TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=2:homefax

+TEL;TYPE=FAX;X-EVOLUTION-UI-SLOT=3:other fax

+TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=4:pager

+TEL;TYPE=ISDN;X-EVOLUTION-UI-SLOT=5:ISDN

+TEL;TYPE=VOICE;X-EVOLUTION-UI-SLOT=6:other phone

+TEL;TYPE="X-EVOLUTION-RADIO";X-EVOLUTION-UI-SLOT=7:radio

+TEL;TYPE="X-EVOLUTION-TELEX";X-EVOLUTION-UI-SLOT=8:telex

+X-JABBER;TYPE=HOME;X-EVOLUTION-UI-SLOT=3:jabber

+X-YAHOO;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:yahoo

+X-MSN;TYPE=HOME;X-EVOLUTION-UI-SLOT=1:msn

+X-GROUPWISE;TYPE=HOME;X-EVOLUTION-UI-SLOT=4:groupwise

+END:VCARD
\ No newline at end of file
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-multiline.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-multiline.vcf
new file mode 100644
index 00000000..596543e3
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-multiline.vcf
@@ -0,0 +1,53 @@
+BEGIN:VCARD

+VERSION:3.0

+FN:Title First Middle Last Suffix

+N:Last;First;Middle;Title;Suffix

+ORG:organization;department;office

+REV:20050226

+ROLE:profession

+TITLE:title

+UID:pas-id-421A5F6100000014

+URL:homepage

+X-EVOLUTION-FILE-AS:Last\, First

+X-EVOLUTION-MANAGER:manager

+X-EVOLUTION-ASSISTANT:assistant

+NICKNAME:nickname

+BDAY:2005-02-10

+X-EVOLUTION-ANNIVERSARY:2005-02-08

+X-EVOLUTION-SPOUSE:spouse

+NOTE:This is a multiline note!\nNote how there are multiple\nl\ni\nn\ne\ns

+CATEGORIES:Birthday,Business

+X-EVOLUTION-BLOG-URL:weblog

+CALURI:calendar

+FBURL:freebusy

+X-EVOLUTION-VIDEO-URL:video chat

+X-MOZILLA-HTML:TRUE

+ADR;TYPE=WORK:PO-BOX2;Multiline street\nmultiline city;Address2;City2;State

+ 2;zip2;country2

+LABEL;TYPE=WORK:Address2\nMultiline street\nmultiline city\nCity2\, State2\

+ nzip2\nPO-BOX2\ncountry2

+ADR;TYPE=HOME:PO-BOX1;Multiline street\nmultiline city\n;Address1;City1;Sta

+ te1;zip1;country1

+LABEL;TYPE=HOME:Address1\nMultiline street\nmultiline city\n\nCity1\, State

+ 1\nzip1\nPO-BOX1\ncountry1

+ADR;TYPE=OTHER:PO-BOX3;Multiline street\nmultiline city;Address3;City3;Stat

+ e3;zip3;country3

+LABEL;TYPE=OTHER:Address3\nMultiline street\nmultiline city\nCity3\, State3

+ \nzip3\nPO-BOX3\ncountry3

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:workemail

+EMAIL;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:homeemail

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=3:otheremail

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=4:otheremail2

+TEL;TYPE="X-EVOLUTION-COMPANY";X-EVOLUTION-UI-SLOT=1:company phone

+TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=2:homefax

+TEL;TYPE=FAX;X-EVOLUTION-UI-SLOT=3:other fax

+TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=4:pager

+TEL;TYPE=ISDN;X-EVOLUTION-UI-SLOT=5:ISDN

+TEL;TYPE=VOICE;X-EVOLUTION-UI-SLOT=6:other phone

+TEL;TYPE="X-EVOLUTION-RADIO";X-EVOLUTION-UI-SLOT=7:radio

+TEL;TYPE="X-EVOLUTION-TELEX";X-EVOLUTION-UI-SLOT=8:telex

+X-JABBER;TYPE=HOME;X-EVOLUTION-UI-SLOT=3:jabber

+X-YAHOO;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:yahoo

+X-MSN;TYPE=HOME;X-EVOLUTION-UI-SLOT=1:msn

+X-GROUPWISE;TYPE=HOME;X-EVOLUTION-UI-SLOT=4:groupwise

+END:VCARD
\ No newline at end of file
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-photo.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-photo.vcf
new file mode 100644
index 00000000..389c9c9e
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-photo.vcf
@@ -0,0 +1,59 @@
+BEGIN:VCARD

+VERSION:3.0

+FN:Title First Middle Last Suffix

+N:Last;First;Middle;Title;Suffix

+ORG:organization;department;office

+REV:20050226T104124,2Z

+ROLE:profession

+TITLE:title

+UID:pas-id-421A5F6100000014

+URL:homepage

+X-EVOLUTION-FILE-AS:Last\, First

+X-EVOLUTION-MANAGER:manager

+X-EVOLUTION-ASSISTANT:assistant

+NICKNAME:nickname

+BDAY:2005-02-10

+X-EVOLUTION-ANNIVERSARY:2005-02-08

+X-EVOLUTION-SPOUSE:spouse

+NOTE:This is a note!

+CATEGORIES:Birthday,Business

+X-EVOLUTION-BLOG-URL:weblog

+CALURI:calendar

+FBURL:freebusy

+X-EVOLUTION-VIDEO-URL:video chat

+X-MOZILLA-HTML:TRUE

+ADR;TYPE=WORK:PO-BOX2;;Address2;City2;State2;zip2;country2

+LABEL;TYPE=WORK:Address2\nCity2\, State2\nzip2\nPO-BOX2\ncountry2

+ADR;TYPE=HOME:PO-BOX1;;Address1;City1;State1;zip1;country1

+LABEL;TYPE=HOME:Address1\nCity1\, State1\nzip1\nPO-BOX1\ncountry1

+ADR;TYPE=OTHER:PO-BOX3;;Address3;City3;State3;zip3;country3

+LABEL;TYPE=OTHER:Address3\nCity3\, State3\nzip3\nPO-BOX3\ncountry3

+PHOTO;ENCODING=b;TYPE=PNG:iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAIAAAADnC86AAAAC

+ XBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QIaEQILc0Ox6gAAAB10RVh0Q29tbWVudABDc

+ mVhdGVkIHdpdGggVGhlIEdJTVDvZCVuAAAB7ElEQVRYw+2XTasxYRjH/8dwGpq8xEaajZeJU

+ BZoykL2ysbCTrGUfAZr2UtJKTtJ8QGUrWKhKOELjMKUtybO4q7ZnM7E88zT6am5Vnd3v7l+m

+ 7muf/fH8/nEb5QOv1SaWBNrYk2sif+pWJKkbrebyWRcLpfBYKBpmuO4QqEwmUze6PJ8s5bLZ

+ TgcJt/SNO12u10uF0VR5CaXy4mi+EofvGu12+0AvF5vr9e7Xq/kXhCEWq3GMAyARCJxuVzUF

+ N/v91AoBCAajR4Oh+/AdDq1WCwAKpWKmuJmswnAaDRuNpufmFarBUCv1+92O9XEPM8DKBaLC

+ owkSSzLAqhWq+qIRVHU6XQARqORMlkqlQAkk0ll7NVxWq/Xj8cDQCQSUSYJsFqt1Jnj/X5PD

+ g6HQ5kkgMz/t5uLjC8AQRCUSQLI/N+KfT4f+bnm87kySQC/36+OmGGYWCwGYDAYKGCPx2M4H

+ AJIpVKq7epGowHAZDJtt9ufmHa7TRaIAvP2ArndboFAAEA8Hj8ej9+B2WxmtVoBlMtllUNis

+ VjYbDYAHMf1+305JPb7fb1eN5vNAHieP5/PKouJOxgMyrHo8XhYlpVjMZvNnk4n9WNRjqlOp

+ 5NOp51OJ0VRn5+fHo8nn8+Px+PXm3xoz1RNrIk18Z/WF7ZpjC1N/OYqAAAAAElFTkSuQmCC

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:workemail

+EMAIL;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:homeemail

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=3:otheremail

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=4:otheremail2

+TEL;TYPE="X-EVOLUTION-COMPANY";X-EVOLUTION-UI-SLOT=1:company phone

+TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=2:homefax

+TEL;TYPE=FAX;X-EVOLUTION-UI-SLOT=3:other fax

+TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=4:pager

+TEL;TYPE=ISDN;X-EVOLUTION-UI-SLOT=5:ISDN

+TEL;TYPE=VOICE;X-EVOLUTION-UI-SLOT=6:other phone

+TEL;TYPE="X-EVOLUTION-RADIO";X-EVOLUTION-UI-SLOT=7:radio

+TEL;TYPE="X-EVOLUTION-TELEX";X-EVOLUTION-UI-SLOT=8:telex

+X-JABBER;TYPE=HOME;X-EVOLUTION-UI-SLOT=3:jabber

+X-YAHOO;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:yahoo

+X-MSN;TYPE=HOME;X-EVOLUTION-UI-SLOT=1:msn

+X-GROUPWISE;TYPE=HOME;X-EVOLUTION-UI-SLOT=4:groupwise

+END:VCARD
\ No newline at end of file
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-special.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-special.vcf
new file mode 100644
index 00000000..c38c0d34
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-special.vcf
@@ -0,0 +1,26 @@
+BEGIN:VCARD

+VERSION:3.0

+FN:Titleö Firstä Middleü Lastß Suffixö

+N:Lastß;Firstä;Middleü;Titleö;Suffixö

+ORG:organization;department;office

+REV:2005-02-26T10:41:24Z

+ROLE:profession

+TITLE:title

+UID:pas-id-421A5F6100000014

+URL:homepage

+X-EVOLUTION-FILE-AS:Lastß\, Firstä

+X-EVOLUTION-MANAGER:manager

+X-EVOLUTION-ASSISTANT:assistant

+NICKNAME:nicknameü

+BDAY:2005-02-10

+X-EVOLUTION-ANNIVERSARY:2005-02-08

+X-EVOLUTION-SPOUSE:spouse

+NOTE:This is a multiline note with special chars\n!"§$%&/()=?`'*+~'#-_:.\;

+ \,^°@€¹²³¼½½¬{[[]}\\¸¨þø→←→€ł@æßðjđŋĸjħł	

+ 	<-tab

+X-EVOLUTION-BLOG-URL:

+CALURI:

+FBURL:

+X-EVOLUTION-VIDEO-URL:

+X-MOZILLA-HTML:FALSE

+END:VCARD
\ No newline at end of file
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-umlaute.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-umlaute.vcf
new file mode 100644
index 00000000..e7bc108e
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/evolution2/evo2-umlaute.vcf
@@ -0,0 +1,54 @@
+BEGIN:VCARD

+VERSION:3.0

+FN:Titleö Firstä Middleü Lastß Suffixö

+N:Lastß;Firstä;Middleü;Titleö;Suffixö

+ORG:organization;department;office

+REV:2005-02-26T10:41:24Z

+ROLE:profession

+TITLE:title

+UID:pas-id-421A5F6100000014

+URL:homepage

+X-EVOLUTION-FILE-AS:Lastß\, Firstä

+X-EVOLUTION-MANAGER:manager

+X-EVOLUTION-ASSISTANT:assistant

+NICKNAME:nicknameü

+BDAY:2005-02-10

+X-EVOLUTION-ANNIVERSARY:2005-02-08

+X-EVOLUTION-SPOUSE:spouse

+NOTE:This is a multiline note with special chars\nNote how there are multip

+ le\nl\ni\nn\ne\ns\nand special chars: öüööüöäüßßß asd

+CATEGORIES:Birthday,Business

+X-EVOLUTION-BLOG-URL:weblog

+CALURI:calendar

+FBURL:freebusy

+X-EVOLUTION-VIDEO-URL:video chat

+X-MOZILLA-HTML:TRUE

+ADR;TYPE=WORK:PO-BOX2;Multiline street\nmultiline cityäüööüä;Address2

+ ;City2;State2;zip2;country2

+LABEL;TYPE=WORK:Address2\nMultiline street\nmultiline cityäüööüä\nCit

+ y2\, State2\nzip2\nPO-BOX2\ncountry2

+ADR;TYPE=HOME:PO-BOX1;Multiline street\nmultiline city\nöüä;Address1;Cit

+ y1;State1;zip1;country1

+LABEL;TYPE=HOME:Address1\nMultiline street\nmultiline city\nöüä\nCity1\,

+  State1\nzip1\nPO-BOX1\ncountry1

+ADR;TYPE=OTHER:PO-BOX3;Multiline street\nmultiline cityä\nöü;Address3;Ci

+ ty3;State3;zip3;country3

+LABEL;TYPE=OTHER:Address3\nMultiline street\nmultiline cityä\nöü\nCity3\

+ , State3\nzip3\nPO-BOX3\ncountry3

+EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:workemailö

+EMAIL;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:homeemailü

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=3:otheremailü

+EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=4:otheremail2ä

+TEL;TYPE="X-EVOLUTION-COMPANY";X-EVOLUTION-UI-SLOT=1:company phoneöä

+TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=2:homefaxöä

+TEL;TYPE=FAX;X-EVOLUTION-UI-SLOT=3:other fax

+TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=4:pagerß

+TEL;TYPE=ISDN;X-EVOLUTION-UI-SLOT=5:ISDNä

+TEL;TYPE=VOICE;X-EVOLUTION-UI-SLOT=6:other phoneö

+TEL;TYPE="X-EVOLUTION-RADIO";X-EVOLUTION-UI-SLOT=7:radioü

+TEL;TYPE="X-EVOLUTION-TELEX";X-EVOLUTION-UI-SLOT=8:telexä

+X-JABBER;TYPE=HOME;X-EVOLUTION-UI-SLOT=3:jabberüä

+X-YAHOO;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:yahooä

+X-MSN;TYPE=HOME;X-EVOLUTION-UI-SLOT=1:msnöä

+X-GROUPWISE;TYPE=HOME;X-EVOLUTION-UI-SLOT=4:groupwiseä

+END:VCARD
\ No newline at end of file
diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-conflict.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-conflict.vcf
new file mode 100644
index 00000000..c2f49165
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-conflict.vcf
@@ -0,0 +1,9 @@
+BEGIN:VCARD

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:kdepimmail

+FN;CHARSET=UTF-8;ENCODING=8BIT:samename

+N;CHARSET=UTF-8;ENCODING=8BIT:samename;;;;

+TEL;TYPE=WORK:samephone

+UID:V7xU0LoAWW

+VERSION:2.1

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-different.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-different.vcf
new file mode 100644
index 00000000..09aca584
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-different.vcf
@@ -0,0 +1,7 @@
+BEGIN:VCARD

+FN;CHARSET=UTF-8;ENCODING=8BIT:kdepimname

+N;CHARSET=UTF-8;ENCODING=8BIT:kdepimname;;;;

+UID:Sd11KbFgl1

+VERSION:2.1

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-same.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-same.vcf
new file mode 100644
index 00000000..77b829ed
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/1-same.vcf
@@ -0,0 +1,10 @@
+BEGIN:VCARD

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:samemail

+FN;CHARSET=UTF-8;ENCODING=8BIT:samename

+N;CHARSET=UTF-8;ENCODING=8BIT:samename;;;;

+TEL;TYPE=WORK:samephone

+UID:sZYtQZb5Ec

+URL:samehomepage

+VERSION:2.1

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-conflict.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-conflict.vcf
new file mode 100644
index 00000000..74a0a636
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-conflict.vcf
@@ -0,0 +1,12 @@
+BEGIN:VCARD

+ADR;TYPE=home:;;sameaddress;;;;Germany

+CLASS:PUBLIC

+EMAIL:samemail

+FN:kdepimname

+N:kdepimname;;;;

+TEL;TYPE=WORK:samephone

+TEL;TYPE=HOME:samephone2

+UID:NbLz18IEVc

+VERSION:3.0

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-different.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-different.vcf
new file mode 100644
index 00000000..496e8512
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-different.vcf
@@ -0,0 +1,10 @@
+BEGIN:VCARD

+ADR;TYPE=home:;;kdepimaddress;;;;Germany

+CLASS:PUBLIC

+FN:samename

+N:samename;;;;

+TEL;TYPE=WORK:kdepimphone

+UID:XtGNq0mPdN

+VERSION:3.0

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-same.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-same.vcf
new file mode 100644
index 00000000..d08155c5
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/compare/2-same.vcf
@@ -0,0 +1,10 @@
+BEGIN:VCARD

+CLASS:PUBLIC

+EMAIL:samemail

+FN:samename

+N:samename;;;;

+NICKNAME:samenick

+UID:XfqLidtnBt

+VERSION:3.0

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full1-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full1-2.1.vcf
new file mode 100644
index 00000000..d99a4df6
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full1-2.1.vcf
@@ -0,0 +1,75 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;lo

+ cal1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a note!

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:always

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full1-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full1-3.0.vcf
new file mode 100644
index 00000000..8e746820
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full1-3.0.vcf
@@ -0,0 +1,75 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;local1;region1;postalcode1;Ger

+ many

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PUBLIC

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a note!

+ORG:organization

+ROLE:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:never

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:always

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full2-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full2-2.1.vcf
new file mode 100644
index 00000000..a6388d19
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full2-2.1.vcf
@@ -0,0 +1,76 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;lo

+ cal1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a note!

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:alwaysIfPossib

+ le

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full2-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full2-3.0.vcf
new file mode 100644
index 00000000..7975ce6a
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-full2-3.0.vcf
@@ -0,0 +1,75 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;local1;region1;postalcode1;Ger

+ many

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PRIVATE

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a note!

+ORG:organization

+ROLE:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:alwaysIfPossible

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:never

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-multiline-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-multiline-2.1.vcf
new file mode 100644
index 00000000..dc500211
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-multiline-2.1.vcf
@@ -0,0 +1,78 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1\nm

+ ultine;local1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a multine note!\nwith\nmultiple\nl

+ ines

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:role

+SOUND;VALUE=URI:/usr/share/sounds/KDE_Event_5.ogg

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:alwaysIfPossib

+ le

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-multiline-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-multiline-3.0.vcf
new file mode 100644
index 00000000..15ef5bb1
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-multiline-3.0.vcf
@@ -0,0 +1,76 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1\nmultine;local1;region1;postal

+ code1;Germany

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PRIVATE

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a multine note!\nwith\nmultiple\nlines

+ORG:organization

+ROLE:role

+SOUND;VALUE=URI:/usr/share/sounds/KDE_Event_5.ogg

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:alwaysIfPossible

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:never

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo1-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo1-2.1.vcf
new file mode 100644
index 00000000..cb06cb9b
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo1-2.1.vcf
@@ -0,0 +1,114 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;lo

+ cal1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+LOGO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAID

+ AAAD1ElEQVR4nO2byyt1URjGH5dyyWXAiAghQwkRkswwFKZSMiD/gTIzlDIQYYiRYkYypCiFiKG

+ S5J6J+zd4favdOV9fHnvbO/X8Rus5WHv186591ll7nYSPjw+Ir5EY9QB+E5JFIFkEkkUgWQSSRS

+ BZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgW

+ QSSRSBZBJJFkBz1APD6+gpgcXHR4tLSEoCdnR2Ll5eXAJKSkiwWFhYCaGxstNjb2wugqakpnKGq

+ sggSojomeXx8bI2uri4A+/v73p+mpqZaIy8vD8DT05PFi4sLAG9vb95f7unpscb09DSAjIyMHxq

+ zKotAsggimIY2Ad1N+vr6GkBpaanFsbExAB0dHRZTUlK8f2u/PDc3Z3F0dBTA4+OjxYaGBgDr6+

+ sW3VwOClUWQXiV9fLyYo2qqioABwcHFqurq+Eph+zs7K/3ubu7C6C1tdXi/f09gOHhYYvj4+P+h

+ +1FlUUgWQThTUNbBAHo7+8HkJaWZtHmY0lJybd7np2dtUZfXx+A5OTPjyWnp6cAioqKvt1zDKos

+ gvAqq76+3hpbW1v4WwUAZmZmfPbsFvTFxcUAzs7OLNrCYmRkxGf/DlUWgWQRhDENbYXtFlDv7+8

+ AVldXLba3twd1ocHBQQCTk5MWm5ubAWxubgbVvyqLIIzNP3sLt4JyVFZWBn6hmD7dLlBQqLIIJI

+ sgjGlo+yox5ObmBn6hmD7/eV0/qLIIJItAsggkiyCMG3xOTk78i1dXV9bIz88P6kKuz/9c1w+qL

+ IIwKqusrAxAYuLnP8aW8nt7exYDrCzXp1FRURFUz4Yqi0CyCMKYhnb4oKamxuL29jaA5eVli/63

+ aNxH9JWVFe/rLS0tPnuOQZVFEN4e/NTUlDUGBgYApKenW7SnO7Z9/j3m5+etYce13NOdk5MTnz3

+ HoMoikCyC8Kbh8/OzNWw/8+joyGJtbS2AtbU1i1lZWV/v0xZW7kZ+d3cHYGhoyOLExIT/YXtRZR

+ FEcD7r8PAQnlOzt7e3AMrLyy3a+ay2tjaLMeezbm5u4Lmj22PUh4cHi3V1dQA2NjYsuhMCQaHKI

+ pAsgshOK9tkBNDd3e2NhjvhaB+z3ZvD+fk54k4rd3Z2WsOO02RmZv7QmFVZBJFVlsOOTy4sLFi0

+ b1jY+UfEfcOioKAAcd+wsMf0IaDKIpAsguin4S9ClUUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJ

+ FIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRfAHfPwYMZb1bW0AAAAASUVORK5CYII=

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a note!

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAI

+ DAAAD1ElEQVR4nO2byyt1URjGH5dyyWXAiAghQwkRkswwFKZSMiD/gTIzlDIQYYiRYkYypCiFiK

+ GS5J6J+zd4favdOV9fHnvbO/X8Rus5WHv186591ll7nYSPjw+Ir5EY9QB+E5JFIFkEkkUgWQSSR

+ SBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUg

+ WQSSRSBZBJJFkBz1APD6+gpgcXHR4tLSEoCdnR2Ll5eXAJKSkiwWFhYCaGxstNjb2wugqakpnKG

+ qsggSojomeXx8bI2uri4A+/v73p+mpqZaIy8vD8DT05PFi4sLAG9vb95f7unpscb09DSAjIyMHx

+ qzKotAsggimIY2Ad1N+vr6GkBpaanFsbExAB0dHRZTUlK8f2u/PDc3Z3F0dBTA4+OjxYaGBgDr6

+ +sW3VwOClUWQXiV9fLyYo2qqioABwcHFqurq+Eph+zs7K/3ubu7C6C1tdXi/f09gOHhYYvj4+P+

+ h+1FlUUgWQThTUNbBAHo7+8HkJaWZtHmY0lJybd7np2dtUZfXx+A5OTPjyWnp6cAioqKvt1zDKo

+ sgvAqq76+3hpbW1v4WwUAZmZmfPbsFvTFxcUAzs7OLNrCYmRkxGf/DlUWgWQRhDENbYXtFlDv7+

+ 8AVldXLba3twd1ocHBQQCTk5MWm5ubAWxubgbVvyqLIIzNP3sLt4JyVFZWBn6hmD7dLlBQqLIIJ

+ IsgjGlo+yox5ObmBn6hmD7/eV0/qLIIJItAsggkiyCMG3xOTk78i1dXV9bIz88P6kKuz/9c1w+q

+ LIIwKqusrAxAYuLnP8aW8nt7exYDrCzXp1FRURFUz4Yqi0CyCMKYhnb4oKamxuL29jaA5eVli/6

+ 3aNxH9JWVFe/rLS0tPnuOQZVFEN4e/NTUlDUGBgYApKenW7SnO7Z9/j3m5+etYce13NOdk5MTnz

+ 3HoMoikCyC8Kbh8/OzNWw/8+joyGJtbS2AtbU1i1lZWV/v0xZW7kZ+d3cHYGhoyOLExIT/YXtRZ

+ RFEcD7r8PAQnlOzt7e3AMrLyy3a+ay2tjaLMeezbm5u4Lmj22PUh4cHi3V1dQA2NjYsuhMCQaHK

+ IpAsgshOK9tkBNDd3e2NhjvhaB+z3ZvD+fk54k4rd3Z2WsOO02RmZv7QmFVZBJFVlsOOTy4sLFi

+ 0b1jY+UfEfcOioKAAcd+wsMf0IaDKIpAsguin4S9ClUUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJ

+ JFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRfAHfPwYMZb1bW0AAAAASUVORK5CYII=

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:alwaysIfPossib

+ le

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo1-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo1-3.0.vcf
new file mode 100644
index 00000000..79dbe4da
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo1-3.0.vcf
@@ -0,0 +1,113 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;local1;region1;postalcode1;Ger

+ many

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PRIVATE

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+LOGO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAID

+ AAAD1ElEQVR4nO2byyt1URjGH5dyyWXAiAghQwkRkswwFKZSMiD/gTIzlDIQYYiRYkYypCiFiKG

+ S5J6J+zd4favdOV9fHnvbO/X8Rus5WHv186591ll7nYSPjw+Ir5EY9QB+E5JFIFkEkkUgWQSSRS

+ BZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgW

+ QSSRSBZBJJFkBz1APD6+gpgcXHR4tLSEoCdnR2Ll5eXAJKSkiwWFhYCaGxstNjb2wugqakpnKGq

+ sggSojomeXx8bI2uri4A+/v73p+mpqZaIy8vD8DT05PFi4sLAG9vb95f7unpscb09DSAjIyMHxq

+ zKotAsggimIY2Ad1N+vr6GkBpaanFsbExAB0dHRZTUlK8f2u/PDc3Z3F0dBTA4+OjxYaGBgDr6+

+ sW3VwOClUWQXiV9fLyYo2qqioABwcHFqurq+Eph+zs7K/3ubu7C6C1tdXi/f09gOHhYYvj4+P+h

+ +1FlUUgWQThTUNbBAHo7+8HkJaWZtHmY0lJybd7np2dtUZfXx+A5OTPjyWnp6cAioqKvt1zDKos

+ gvAqq76+3hpbW1v4WwUAZmZmfPbsFvTFxcUAzs7OLNrCYmRkxGf/DlUWgWQRhDENbYXtFlDv7+8

+ AVldXLba3twd1ocHBQQCTk5MWm5ubAWxubgbVvyqLIIzNP3sLt4JyVFZWBn6hmD7dLlBQqLIIJI

+ sgjGlo+yox5ObmBn6hmD7/eV0/qLIIJItAsggkiyCMG3xOTk78i1dXV9bIz88P6kKuz/9c1w+qL

+ IIwKqusrAxAYuLnP8aW8nt7exYDrCzXp1FRURFUz4Yqi0CyCMKYhnb4oKamxuL29jaA5eVli/63

+ aNxH9JWVFe/rLS0tPnuOQZVFEN4e/NTUlDUGBgYApKenW7SnO7Z9/j3m5+etYce13NOdk5MTnz3

+ HoMoikCyC8Kbh8/OzNWw/8+joyGJtbS2AtbU1i1lZWV/v0xZW7kZ+d3cHYGhoyOLExIT/YXtRZR

+ FEcD7r8PAQnlOzt7e3AMrLyy3a+ay2tjaLMeezbm5u4Lmj22PUh4cHi3V1dQA2NjYsuhMCQaHKI

+ pAsgshOK9tkBNDd3e2NhjvhaB+z3ZvD+fk54k4rd3Z2WsOO02RmZv7QmFVZBJFVlsOOTy4sLFi0

+ b1jY+UfEfcOioKAAcd+wsMf0IaDKIpAsguin4S9ClUUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJ

+ FIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRfAHfPwYMZb1bW0AAAAASUVORK5CYII=

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a note!

+ORG:organization

+PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAIAAAD/gAI

+ DAAAD1ElEQVR4nO2byyt1URjGH5dyyWXAiAghQwkRkswwFKZSMiD/gTIzlDIQYYiRYkYypCiFiK

+ GS5J6J+zd4favdOV9fHnvbO/X8Rus5WHv186591ll7nYSPjw+Ir5EY9QB+E5JFIFkEkkUgWQSSR

+ SBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJJFIFkEkkUg

+ WQSSRSBZBJJFkBz1APD6+gpgcXHR4tLSEoCdnR2Ll5eXAJKSkiwWFhYCaGxstNjb2wugqakpnKG

+ qsggSojomeXx8bI2uri4A+/v73p+mpqZaIy8vD8DT05PFi4sLAG9vb95f7unpscb09DSAjIyMHx

+ qzKotAsggimIY2Ad1N+vr6GkBpaanFsbExAB0dHRZTUlK8f2u/PDc3Z3F0dBTA4+OjxYaGBgDr6

+ +sW3VwOClUWQXiV9fLyYo2qqioABwcHFqurq+Eph+zs7K/3ubu7C6C1tdXi/f09gOHhYYvj4+P+

+ h+1FlUUgWQThTUNbBAHo7+8HkJaWZtHmY0lJybd7np2dtUZfXx+A5OTPjyWnp6cAioqKvt1zDKo

+ sgvAqq76+3hpbW1v4WwUAZmZmfPbsFvTFxcUAzs7OLNrCYmRkxGf/DlUWgWQRhDENbYXtFlDv7+

+ 8AVldXLba3twd1ocHBQQCTk5MWm5ubAWxubgbVvyqLIIzNP3sLt4JyVFZWBn6hmD7dLlBQqLIIJ

+ IsgjGlo+yox5ObmBn6hmD7/eV0/qLIIJItAsggkiyCMG3xOTk78i1dXV9bIz88P6kKuz/9c1w+q

+ LIIwKqusrAxAYuLnP8aW8nt7exYDrCzXp1FRURFUz4Yqi0CyCMKYhnb4oKamxuL29jaA5eVli/6

+ 3aNxH9JWVFe/rLS0tPnuOQZVFEN4e/NTUlDUGBgYApKenW7SnO7Z9/j3m5+etYce13NOdk5MTnz

+ 3HoMoikCyC8Kbh8/OzNWw/8+joyGJtbS2AtbU1i1lZWV/v0xZW7kZ+d3cHYGhoyOLExIT/YXtRZ

+ RFEcD7r8PAQnlOzt7e3AMrLyy3a+ay2tjaLMeezbm5u4Lmj22PUh4cHi3V1dQA2NjYsuhMCQaHK

+ IpAsgshOK9tkBNDd3e2NhjvhaB+z3ZvD+fk54k4rd3Z2WsOO02RmZv7QmFVZBJFVlsOOTy4sLFi

+ 0b1jY+UfEfcOioKAAcd+wsMf0IaDKIpAsguin4S9ClUUgWQSSRSBZBJJFIFkEkkUgWQSSRSBZBJ

+ JFIFkEkkUgWQSSRSBZBJJFIFkEkkUgWQSSRfAHfPwYMZb1bW0AAAAASUVORK5CYII=

+ROLE:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:alwaysIfPossible

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:never

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo2-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo2-2.1.vcf
new file mode 100644
index 00000000..c0e9c712
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo2-2.1.vcf
@@ -0,0 +1,78 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;lo

+ cal1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+LOGO;VALUE=URI:/home/azrael/vcard.png

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a note!

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+PHOTO;VALUE=URI:/home/azrael/vcard.png

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:alwaysIfPossib

+ le

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo2-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo2-3.0.vcf
new file mode 100644
index 00000000..ee5de13d
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-photo2-3.0.vcf
@@ -0,0 +1,77 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;local1;region1;postalcode1;Ger

+ many

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PRIVATE

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+LOGO;VALUE=URI:/home/azrael/vcard.png

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a note!

+ORG:organization

+PHOTO;VALUE=URI:/home/azrael/vcard.png

+ROLE:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:alwaysIfPossible

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:never

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound1-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound1-2.1.vcf
new file mode 100644
index 00000000..a6388d19
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound1-2.1.vcf
@@ -0,0 +1,76 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;lo

+ cal1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a note!

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:alwaysIfPossib

+ le

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound1-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound1-3.0.vcf
new file mode 100644
index 00000000..7975ce6a
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound1-3.0.vcf
@@ -0,0 +1,75 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;local1;region1;postalcode1;Ger

+ many

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PRIVATE

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a note!

+ORG:organization

+ROLE:role

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:alwaysIfPossible

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:never

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound2-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound2-2.1.vcf
new file mode 100644
index 00000000..f9e5ad7c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound2-2.1.vcf
@@ -0,0 +1,77 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;lo

+ cal1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a note!

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:role

+SOUND;VALUE=URI:/usr/share/sounds/KDE_Event_5.ogg

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:alwaysIfPossib

+ le

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound2-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound2-3.0.vcf
new file mode 100644
index 00000000..cea91d7b
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-sound2-3.0.vcf
@@ -0,0 +1,76 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1;local1;region1;postalcode1;Ger

+ many

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PRIVATE

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a note!

+ORG:organization

+ROLE:role

+SOUND;VALUE=URI:/usr/share/sounds/KDE_Event_5.ogg

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:alwaysIfPossible

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:never

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-special-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-special-2.1.vcf
new file mode 100644
index 00000000..48b85843
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-special-2.1.vcf
@@ -0,0 +1,79 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1\nm

+ ultine;local1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a multine note! öääüßöäü\n°^!"§$%&

+ /()=?`*'Ä_:;>^+#-.,<¬¹²³¼½¬{[]}\\¸~¨`^þø→↓←ŧ¶€ł@æßðđŋħjĸł˝^`|«»¢“”nµ─· <-tab

+ \nwith\nmultiple\nlines

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:roleäöüüüäö

+SOUND;VALUE=URI:/usr/share/sounds/KDE_Event_5.ogg

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:alwaysIfPossib

+ le

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-special-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-special-3.0.vcf
new file mode 100644
index 00000000..99923db8
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-special-3.0.vcf
@@ -0,0 +1,77 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1\nmultine;local1;region1;postal

+ code1;Germany

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PRIVATE

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a multine note! öääüßöäü\n°^!"§$%&/()=?`*'Ä_:;>^+#-.,<¬¹²³¼½¬{

+ []}\\¸~¨`^þø→↓←ŧ¶€ł@æßðđŋħjĸł˝^`|«»¢“”nµ─· <-tab\nwith\nmultiple\nlines

+ORG:organization

+ROLE:roleäöüüüäö

+SOUND;VALUE=URI:/usr/share/sounds/KDE_Event_5.ogg

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:alwaysIfPossible

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:never

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-umlaute-2.1.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-umlaute-2.1.vcf
new file mode 100644
index 00000000..c51554dd
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-umlaute-2.1.vcf
@@ -0,0 +1,78 @@
+BEGIN:VCARD

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=work:pobox2;;Street1 work;locale2;regi

+ on2;postalcode2;Germany

+ADR;CHARSET=UTF-8;ENCODING=8BIT;TYPE=home;TYPE=pref:pobox1;;HomeAddress1\nm

+ ultine;local1;region1;postalcode1;Germany

+BDAY:2005-02-26T00:00:00Z

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT;TYPE=PREF:email1

+EMAIL;CHARSET=UTF-8;ENCODING=8BIT:[email protected]

+FN;CHARSET=UTF-8;ENCODING=8BIT:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N;CHARSET=UTF-8;ENCODING=8BIT:familynames;givenname;additional names;prefix

+ ;suffix

+NOTE;CHARSET=UTF-8;ENCODING=8BIT:This is a multine note! öääüßöäü\nwith\nmu

+ ltiple\nlines

+ORG;CHARSET=UTF-8;ENCODING=8BIT:organization

+ROLE;CHARSET=UTF-8;ENCODING=8BIT:roleäöüüüäö

+SOUND;VALUE=URI:/usr/share/sounds/KDE_Event_5.ogg

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:2.1

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF;CHARSET=UTF-8;ENCODING=8BIT:alwaysIfPossib

+ le

+X-KADDRESSBOOK-CRYPTOPROTOPREF;CHARSET=UTF-8;ENCODING=8BIT:inline openpgp,o

+ penpgp/mime,s/mime,s/mime opaque

+X-KADDRESSBOOK-CRYPTOSIGNPREF;CHARSET=UTF-8;ENCODING=8BIT:never

+X-KADDRESSBOOK-OPENPGPFP;CHARSET=UTF-8;ENCODING=8BIT:C754DDC1ECF537C4805710

+ FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary;CHARSET=UTF-8;ENCODING=8BIT:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName;CHARSET=UTF-8;ENCODING=8BIT:assistant

+X-KADDRESSBOOK-X-Department;CHARSET=UTF-8;ENCODING=8BIT:department

+X-KADDRESSBOOK-X-IMAddress;CHARSET=UTF-8;ENCODING=8BIT:im address

+X-KADDRESSBOOK-X-ManagersName;CHARSET=UTF-8;ENCODING=8BIT:manager

+X-KADDRESSBOOK-X-Office;CHARSET=UTF-8;ENCODING=8BIT:office

+X-KADDRESSBOOK-X-Profession;CHARSET=UTF-8;ENCODING=8BIT:profession

+X-KADDRESSBOOK-X-SpousesName;CHARSET=UTF-8;ENCODING=8BIT:spouse

+X-messaging/aim-All;CHARSET=UTF-8;ENCODING=8BIT:aim

+X-messaging/gadu-All;CHARSET=UTF-8;ENCODING=8BIT:gadugadu

+X-messaging/icq-All;CHARSET=UTF-8;ENCODING=8BIT:icq

+X-messaging/irc-All;CHARSET=UTF-8;ENCODING=8BIT:irc

+X-messaging/msn-All;CHARSET=UTF-8;ENCODING=8BIT:msn

+X-messaging/sms-All;CHARSET=UTF-8;ENCODING=8BIT:im sms

+X-messaging/xmpp-All;CHARSET=UTF-8;ENCODING=8BIT:jabber

+X-messaging/yahoo-All;CHARSET=UTF-8;ENCODING=8BIT:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-umlaute-3.0.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-umlaute-3.0.vcf
new file mode 100644
index 00000000..5303c4fa
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/kdepim/kdepim-umlaute-3.0.vcf
@@ -0,0 +1,76 @@
+BEGIN:VCARD

+ADR;TYPE=work:pobox2;;Street1 work;locale2;region2;postalcode2;Germany

+ADR;TYPE=home;TYPE=pref:pobox1;;HomeAddress1\nmultine;local1;region1;postal

+ code1;Germany

+BDAY:2005-02-26T00:00:00Z

+CATEGORIES:Customer,Family

+CLASS:PRIVATE

+EMAIL;TYPE=PREF:email1

+EMAIL:[email protected]

+FN:givenname familynames

+GEO:52.500000;13.366667

+KEY;ENCODING=b;TYPE=PGP:mQGiBECXtzARBAC99Ll8ePW6FCzq8KUBwEYzo+J/u4EmkgCxgWm

+ Vzsvj2Uu7/OhwFaGJcv+fBSF+XtGhZeUk+Pcl4x0tMY5H07/k6ObF8+0O164J+Jg5bMlk2I6X1n

+ UhmAA4aIZCALHwcNZCq9b7HMKr3Sh1eMas2MQ2hL7mTrkfrcxqSNmTA1l/BwCgo+yOOozD6kohz

+ nRr+8jiYimho30EAJDN9YKkTh3kM1jrc9Q11N7zEnQUXtPC4GqQmW7BXgEmSBErEduk3N9NqnzG

+ xFruQrpXWisExv4z/t67uBou++m64J/Ad+T6wC19h72U15UVch/4bU7YqACjdlocUBfmnV3njko

+ Dhl6wmg7fxdCOJfkCXw+VKD9iiqXiSlqFh3IjA/4hdl3npIPKa0EeDnHDSUIbtZAd74i3Lzz1fJ

+ h5vip5N3alqSynJPmzPCWE7dMzOB/iPb+G50X046QT2OEypN9L5Trd5KJonlg+crN/aUZSjCmCC

+ foaBiISdox753MkVOipWH15F27KOqPHBNLrCnrYVCLMNpN/4aSbrn7AXzjbELQlQXJtaW4gQmF1

+ ZXIgPGFybWluLmJhdWVyQGRlc3Njb24uY29tPoheBBMRAgAeBQJAl7cwAhsDBgsJCAcDAgMVAgM

+ DFgIBAh4BAheAAAoJEKvc+7/ZPVGpDNQAmwaN2121JO3i3AcRT5ns8KeQU2x2AJ9w5i2jQ5gZ4m

+ 3jVJPFohsL03i2hbQgQXJtaW4gQmF1ZXIgPGF6cmFlbEBkZXNzY29uLmNvbT6IXgQTEQIAHgUCQ

+ Je5JQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCr3Pu/2T1RqfVrAJ9ANz3hB4TqVahybg8i

+ XJUfmOtjbACfSLJBPGBI84P/RIEe7FKCDC05ZT65AQ0EQJe3MBAEALFujyLPriDAyh0+u8KXoBf

+ SSrnyrDnjvhG0gGsyqSfE06JvKDK6q0ZUlRAj/1cbHS+Rb8t6mUN8HquVjPkWG6eNhcGNnRxjc+

+ 7OqCiVhN7rt4c2HibVQWLy/8y04/Uqj2F9TwaiiuixIJiVA0tdqdgPxFFSCS6aRJhJ6EBw+rbXA

+ AMFBACtsn+fb3aQlaFiBurznAHmv/j2X3k2WXtaubPkNKEWf7HyLos0F5vSw0/hh0/YBabdpaK8

+ LNNuP3Q0ABPjUzyK7cH5fxHPb8BWKIKvB5aXAPr4fMFnRmvpzKmmV1yxegHQvmnpZEloODtWa1J

+ /qNq8OlFhks4tVFyxj7uKmRF1yIhJBBgRAgAJBQJAl7cwAhsMAAoJEKvc+7/ZPVGpqaoAn0yTGk

+ 6w/agEpgjKrsDAACV3l8mpAJ9X3AzwPCKMIx+NpIetkoKFroWxrQ==

+N:familynames;givenname;additional names;prefix;suffix

+NICKNAME:nickname

+NOTE:This is a multine note! öääüßöäü\nwith\nmultiple\nlines

+ORG:organization

+ROLE:roleäöüüüäö

+SOUND;VALUE=URI:/usr/share/sounds/KDE_Event_5.ogg

+TEL;TYPE=WORK:workphone

+TEL;TYPE=FAX;TYPE=WORK:work fax

+TEL;TYPE=HOME:homephone

+TEL;TYPE=CELL:mobilephone

+TEL;TYPE=FAX;TYPE=HOME:homefax

+TEL;TYPE=MSG:messenger

+TEL;TYPE=FAX;TYPE=PREF:fax

+TEL;TYPE=VIDEO:vidoe

+TEL;TYPE=MODEM:modem

+TEL;TYPE=ISDN:isdn

+TEL;TYPE=PAGER:pager

+TEL;TYPE=BBS:mailbox

+TEL;TYPE=CAR:car

+TEL;TYPE=PCS:pcs

+UID:aZAQgtBIOB

+URL:homepage

+VERSION:3.0

+X-KADDRESSBOOK-CRYPTOENCRYPTPREF:alwaysIfPossible

+X-KADDRESSBOOK-CRYPTOPROTOPREF:inline openpgp,openpgp/mime,s/mime,s/mime op

+ aque

+X-KADDRESSBOOK-CRYPTOSIGNPREF:never

+X-KADDRESSBOOK-OPENPGPFP:C754DDC1ECF537C4805710FDABDCFBBFD93D51A9

+X-KADDRESSBOOK-X-Anniversary:2005-02-10

+X-KADDRESSBOOK-X-AssistantsName:assistant

+X-KADDRESSBOOK-X-Department:department

+X-KADDRESSBOOK-X-IMAddress:im address

+X-KADDRESSBOOK-X-ManagersName:manager

+X-KADDRESSBOOK-X-Office:office

+X-KADDRESSBOOK-X-Profession:profession

+X-KADDRESSBOOK-X-SpousesName:spouse

+X-messaging/aim-All:aim

+X-messaging/gadu-All:gadugadu

+X-messaging/icq-All:icq

+X-messaging/irc-All:irc

+X-messaging/msn-All:msn

+X-messaging/sms-All:im sms

+X-messaging/xmpp-All:jabber

+X-messaging/yahoo-All:yahoo

+END:VCARD

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vcards/malformed.vcf b/debian/opensync/opensync-0.22/tests/data/vcards/malformed.vcf
new file mode 100644
index 00000000..4d9c3a9b
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vcards/malformed.vcf
@@ -0,0 +1,3 @@
+BEGIN:VCARD
+N:test user
+END:VCARD
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/crash.ics b/debian/opensync/opensync-0.22/tests/data/vevents/crash.ics
new file mode 100644
index 00000000..e98a7069
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/crash.ics
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VEVENT
+ATTENDEE;CN=�;ROLE=REQ-PARTICIPANT;RSVP=TRUE;
+ PARTSTAT=ACCEPTED:MAILTO:[email protected]
+ORGANIZER:MAILTO:[email protected]
+DTSTART:20050726T053000Z
+DTEND:20050726T053000Z
+TRANSP:OPAQUE
+SEQUENCE:0
+UID:
+
+040000008200E00074C5B7101A82E0080000000070D7AE8F808CC501000000000000000010
+ 0000008C05F5F3D72E3B4C9A3BC7FBF434B6CD
+DTSTAMP:20050719T144024Z
+DESCRIPTION: Bruxelles\, Copenhague\, Madrid\, Paris.\n\n*~*~*~*~*~*~*~*~*~*\n\nSi
+s être l� \n
+SUMMARY:ec
+PRIORITY:5
+CLASS:PUBLIC
+X-MICROSOFT-CDO-REPLYTIME:20050719T153821Z
+CREATED:20050719T153821
+LAST-MODIFIED:20050719T153821
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour-alarm.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour-alarm.vcf
new file mode 100644
index 00000000..d5df7a17
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour-alarm.vcf
@@ -0,0 +1,43 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T110542Z-4349-1000-1-1@craal
+DTSTAMP:20050329T110542Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T120000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T130000
+TRANSP:TRANSPARENT
+SEQUENCE:3
+SUMMARY:single 1 hour alarm
+CLASS:PUBLIC
+CREATED:20050329T110602
+LAST-MODIFIED:20050329T110602
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20050329T110602Z-4310-1000-1-17@craal
+DESCRIPTION:single 1 hour alarm
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour-alarm2.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour-alarm2.vcf
new file mode 100644
index 00000000..a7c351a3
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour-alarm2.vcf
@@ -0,0 +1,64 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T110617Z-4349-1000-1-2@craal
+DTSTAMP:20050329T110617Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T120000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T123000
+TRANSP:TRANSPARENT
+SEQUENCE:2
+SUMMARY:single 1 hour alarm 2
+LOCATION:location
+DESCRIPTION:description
+CATEGORIES:Birthday\,Business
+CLASS:PRIVATE
+CREATED:20050329T110801
+LAST-MODIFIED:20050329T110801
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20050329T110648Z-4310-1000-1-21@craal
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+DESCRIPTION:single 1 hour alarm 2
+END:VALARM
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20050329T110654Z-4310-1000-1-22@craal
+TRIGGER;VALUE=DURATION;RELATED=END:PT15H
+ACTION:AUDIO
+REPEAT:1
+DURATION:PT5M
+ATTACH:/home/azrael/play.pls
+DESCRIPTION:single 1 hour alarm 2
+END:VALARM
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20050329T110725Z-4310-1000-1-23@craal
+TRIGGER;VALUE=DURATION;RELATED=START:P15D
+ACTION:PROCEDURE
+REPEAT:2
+DURATION:PT4H
+ATTACH:test
+DESCRIPTION:--test
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour.vcf
new file mode 100644
index 00000000..4d9d347d
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/1-hour.vcf
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T110513Z-4310-1000-1-5@craal
+DTSTAMP:20050329T110414Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T120000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T130000
+TRANSP:OPAQUE
+SEQUENCE:3
+SUMMARY:single 1 hour
+CLASS:PUBLIC
+CREATED:20050329T110513
+LAST-MODIFIED:20050329T110513
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/all-day.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/all-day.vcf
new file mode 100644
index 00000000..54b7f3fe
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/all-day.vcf
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VEVENT
+UID:20050329T110812Z-4349-1000-1-3@craal
+DTSTAMP:20050329T110812Z
+DTSTART;VALUE=DATE:20050101
+DTEND;VALUE=DATE:20050102
+TRANSP:TRANSPARENT
+SEQUENCE:2
+SUMMARY:all day event1
+CLASS:CONFIDENTIAL
+CREATED:20050329T110837
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/all-day2.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/all-day2.vcf
new file mode 100644
index 00000000..15ac2181
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/all-day2.vcf
@@ -0,0 +1,23 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VEVENT
+UID:20050329T110841Z-4349-1000-1-4@craal
+DTSTAMP:20050329T110841Z
+DTSTART;VALUE=DATE:20050101
+DTEND;VALUE=DATE:20050103
+TRANSP:TRANSPARENT
+SEQUENCE:2
+SUMMARY:all day event 2
+CLASS:PUBLIC
+CREATED:20050329T110901
+LAST-MODIFIED:20050329T110901
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20050329T110901Z-4310-1000-1-34@craal
+DESCRIPTION:all day event 2
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/evo2-recur-until.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/evo2-recur-until.vcf
new file mode 100644
index 00000000..b3415b8c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/evo2-recur-until.vcf
@@ -0,0 +1,48 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050307T174013Z-32171-1000-1-31@azrael
+DTSTAMP:20050307T174013Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050307T124500
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050307T130000
+TRANSP:OPAQUE
+SEQUENCE:2
+SUMMARY:Summary
+LOCATION:Location
+DESCRIPTION:Description\nline2\näö\nasd
+CATEGORIES:Birthday\,Business
+CLASS:PUBLIC
+RRULE:FREQ=DAILY;UNTIL=20050309;INTERVAL=1
+EXDATE;VALUE=DATE:20050308
+CREATED:20050307T174125
+LAST-MODIFIED:20050307T174125
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20050307T174125Z-32152-1000-1-16@azrael
+DESCRIPTION:Summary
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/free-busy.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/free-busy.vcf
new file mode 100644
index 00000000..ee88a38c
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/free-busy.vcf
@@ -0,0 +1,55 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Moscow
+X-LIC-LOCATION:Europe/Moscow
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+TZNAME:MSD
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+TZNAME:MSK
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/America/Los_Angeles
+X-LIC-LOCATION:America/Los_Angeles
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+TZNAME:PST
+DTSTART:19701025T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+TZNAME:PDT
+DTSTART:19700405T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T111426Z-4349-1000-1-11@craal
+DTSTAMP:20050329T111426Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Moscow:
+ 20050101T123000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/America/Los_Angeles:
+ 20050101T130000
+TRANSP:OPAQUE
+SEQUENCE:2
+SUMMARY:free busy + different timezone
+CLASS:PUBLIC
+CREATED:20050329T111518
+LAST-MODIFIED:20050329T111518
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/full-special.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/full-special.vcf
new file mode 100644
index 00000000..7690fab6
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/full-special.vcf
@@ -0,0 +1,41 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T113101Z-4349-1000-1-18@craal
+DTSTAMP:20050329T113101Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T123000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T130000
+TRANSP:OPAQUE
+SEQUENCE:2
+SUMMARY:full special
+LOCATION:öäöää#++#\\\\\\\\\\\\///
+DESCRIPTION:
+ /&/((//&%$%!$§\"&%!$§&%$!&$%R§\"/&%!(//=)()?=?{[{]}\\¸´*+*üüäö\n#
+ ä#äö##-.\,\,..-\\n--.\,|<<>^^°
+CLASS:PUBLIC
+CREATED:20050329T113204
+LAST-MODIFIED:20050329T113204
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-every-year.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-every-year.vcf
new file mode 100644
index 00000000..bf6c9b4d
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-every-year.vcf
@@ -0,0 +1,38 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T111314Z-4349-1000-1-9@craal
+DTSTAMP:20050329T111314Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T160000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T163000
+TRANSP:OPAQUE
+SEQUENCE:2
+SUMMARY:rec every year
+CLASS:PUBLIC
+RRULE:FREQ=YEARLY;INTERVAL=1
+CREATED:20050329T111333
+LAST-MODIFIED:20050329T111333
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-except.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-except.vcf
new file mode 100644
index 00000000..77837a79
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-except.vcf
@@ -0,0 +1,39 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T111337Z-4349-1000-1-10@craal
+DTSTAMP:20050329T111337Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T160000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T163000
+TRANSP:OPAQUE
+SEQUENCE:2
+SUMMARY:rec one week except
+CLASS:PUBLIC
+RRULE:FREQ=DAILY;COUNT=7;INTERVAL=1
+EXDATE;VALUE=DATE:20050104
+CREATED:20050329T111411
+LAST-MODIFIED:20050329T111411
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-for.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-for.vcf
new file mode 100644
index 00000000..eb605057
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-for.vcf
@@ -0,0 +1,38 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T111159Z-4349-1000-1-8@craal
+DTSTAMP:20050329T111159Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T140000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T143000
+TRANSP:TRANSPARENT
+SEQUENCE:2
+SUMMARY:rec 1 week for 3 weeks
+CLASS:PUBLIC
+RRULE:FREQ=WEEKLY;COUNT=3;INTERVAL=1;BYDAY=SA
+CREATED:20050329T111306
+LAST-MODIFIED:20050329T111306
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-forever.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-forever.vcf
new file mode 100644
index 00000000..67711685
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-forever.vcf
@@ -0,0 +1,38 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T110905Z-4349-1000-1-5@craal
+DTSTAMP:20050329T110905Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T140000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T143000
+TRANSP:TRANSPARENT
+SEQUENCE:2
+SUMMARY:rec once forever
+CLASS:PUBLIC
+RRULE:FREQ=DAILY;INTERVAL=1
+CREATED:20050329T110925
+LAST-MODIFIED:20050329T110925
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-until.vcf b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-until.vcf
new file mode 100644
index 00000000..a7c8c168
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/evolution2/rec-until.vcf
@@ -0,0 +1,44 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:20050329T111052Z-4349-1000-1-7@craal
+DTSTAMP:20050329T111052Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T140000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T143000
+TRANSP:OPAQUE
+SEQUENCE:2
+SUMMARY:rec every 2 days until 5 days
+CLASS:PUBLIC
+RRULE:FREQ=DAILY;UNTIL=20050105;INTERVAL=2
+CREATED:20050329T111148
+LAST-MODIFIED:20050329T111148
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20050329T111148Z-4310-1000-1-52@craal
+DESCRIPTION:rec every 2 days until 5 days
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/kdepim/1-hour-1.0.vcs b/debian/opensync/opensync-0.22/tests/data/vevents/kdepim/1-hour-1.0.vcs
new file mode 100644
index 00000000..c8944e02
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/kdepim/1-hour-1.0.vcs
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR

+PRODID:-//K Desktop Environment//NONSGML libkcal 3.2//EN

+VERSION:1.0

+BEGIN:VEVENT

+DTSTART:20050101T110000Z

+DTEND:20050101T120000Z

+DCREATED:20050329T131635Z

+UID:libkcal-774591933.717

+SEQUENCE:0

+LAST-MODIFIED:20050329T131635Z

+X-ORGANIZER:MAILTO:nobody@nowhere

+SUMMARY:single 1 hour

+CLASS:PUBLIC

+PRIORITY:3

+TRANSP:0

+END:VEVENT

+

+END:VCALENDAR

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/kdepim/1-hour-2.0.ics b/debian/opensync/opensync-0.22/tests/data/vevents/kdepim/1-hour-2.0.ics
new file mode 100644
index 00000000..bd3feee7
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/kdepim/1-hour-2.0.ics
@@ -0,0 +1,20 @@
+BEGIN:VCALENDAR
+PRODID:-//K Desktop Environment//NONSGML libkcal 3.2//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20050329T131810Z
+ORGANIZER;CN=Anonymous:MAILTO:nobody@nowhere
+CREATED:20050329T131635Z
+UID:libkcal-774591933.717
+SEQUENCE:0
+LAST-MODIFIED:20050329T131635Z
+SUMMARY:single 1 hour
+CLASS:PUBLIC
+PRIORITY:3
+DTSTART:20050101T110000Z
+DTEND:20050101T120000Z
+TRANSP:OPAQUE
+END:VEVENT
+
+END:VCALENDAR
+
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/qp_wrap b/debian/opensync/opensync-0.22/tests/data/vevents/qp_wrap
new file mode 100644
index 00000000..2d3b6188
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/qp_wrap
@@ -0,0 +1,10 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+DTSTART:20070112T133000Z
+DTEND:20070112T143000Z
+SUMMARY:Test Quoted Printable
+DESCRIPTION;ENCODING=QUOTED-PRINTABLE:=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1
+LOCATION;ENCODING=QUOTED-PRINTABLE:XXXX=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1=C1
+END:VEVENT
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vevents/utf8_wrap b/debian/opensync/opensync-0.22/tests/data/vevents/utf8_wrap
new file mode 100644
index 00000000..76f990ca
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vevents/utf8_wrap
@@ -0,0 +1,10 @@
+BEGIN:VCALENDAR

+VERSION:1.0

+BEGIN:VEVENT

+DTSTART:20070112T133000Z

+DTEND:20070112T143000Z

+SUMMARY:Test UTF-8

+DESCRIPTION;CHARSET=UTF-8:ÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁ

+LOCATION;CHARSET=UTF-8:XXXXÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁ

+END:VEVENT

+END:VCALENDAR

diff --git a/debian/opensync/opensync-0.22/tests/data/vnotes/vnote-minimal.vnt b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote-minimal.vnt
new file mode 100644
index 00000000..e323ab1b
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote-minimal.vnt
@@ -0,0 +1,5 @@
+BEGIN:VNOTE

+VERSION:1.1

+BODY:This is just a test

+END:VNOTE

+

diff --git a/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1-same.vnt b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1-same.vnt
new file mode 100644
index 00000000..860791e1
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1-same.vnt
@@ -0,0 +1,10 @@
+BEGIN:VNOTE

+VERSION:1.1

+X-IRMC-LUID:someuid5

+DCREATED:2005-04-07

+LAST-MODIFIED:2005-04-08

+SUMMARY:This is a summary

+BODY:This is just a test

+CATEGORIES:Birthday,Friends

+CLASS:PUBLIC

+END:VNOTE

diff --git a/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1-similar.vnt b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1-similar.vnt
new file mode 100644
index 00000000..d9204e6f
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1-similar.vnt
@@ -0,0 +1,10 @@
+BEGIN:VNOTE

+VERSION:1.1

+X-IRMC-LUID:someuid3

+DCREATED:2005-04-06

+LAST-MODIFIED:2005-04-07

+SUMMARY:This is a summary

+BODY:This is just a test

+CATEGORIES:Birthday,Friends,Test

+CLASS:PRIVATE

+END:VNOTE

diff --git a/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1.vnt b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1.vnt
new file mode 100644
index 00000000..0824dfdc
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote1.vnt
@@ -0,0 +1,10 @@
+BEGIN:VNOTE

+VERSION:1.1

+X-IRMC-LUID:someuid

+DCREATED:2005-04-05

+LAST-MODIFIED:2005-04-06

+SUMMARY:This is a summary

+BODY:This is just a test

+CATEGORIES:Birthday,Friends

+CLASS:PUBLIC

+END:VNOTE

diff --git a/debian/opensync/opensync-0.22/tests/data/vnotes/vnote2.vnt b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote2.vnt
new file mode 100644
index 00000000..2197ab4b
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote2.vnt
@@ -0,0 +1,10 @@
+BEGIN:VNOTE

+VERSION:1.1

+X-IRMC-LUID:someuid2

+DCREATED:2005-04-05T01:01:01Z

+LAST-MODIFIED:2005-04-06T01:01:01Z

+SUMMARY:This is a summary

+BODY:This is just a test lines

+CATEGORIES:Birthday,Friends

+CLASS:PRIVATE

+END:VNOTE

diff --git a/debian/opensync/opensync-0.22/tests/data/vnotes/vnote3.vnt b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote3.vnt
new file mode 100644
index 00000000..1b065955
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vnotes/vnote3.vnt
@@ -0,0 +1,8 @@
+BEGIN:VNOTE

+VERSION:1.1

+DCREATED:20050405

+LAST-MODIFIED:20050406

+SUMMARY:This is a summary

+BODY:This is a multi\nline\nbody with special chars

+CLASS:CONFIDENTIAL

+END:VNOTE

diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full1.vcf b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full1.vcf
new file mode 100644
index 00000000..3a736123
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full1.vcf
@@ -0,0 +1,51 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Asia/Baghdad
+X-LIC-LOCATION:Asia/Baghdad
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+TZNAME:ADT
+DTSTART:19700401T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+TZNAME:AST
+DTSTART:19701001T040000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_4/Africa/Douala
+X-LIC-LOCATION:Africa/Douala
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:WAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTODO
+UID:20050306T005538Z-4378-1000-1-28@azrael
+DTSTAMP:20050306T005538Z
+SUMMARY:summary
+DESCRIPTION:Description
+DUE;TZID=/softwarestudio.org/Olson_20011030_4/Africa/Douala:
+ 20050330T003000
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Asia/Baghdad:
+ 20050306T010000
+CLASS:PUBLIC
+CATEGORIES:Birthday\,Business
+PERCENT-COMPLETE:0
+PRIORITY:0
+URL:webpage
+SEQUENCE:1
+CREATED:20050306T005650
+LAST-MODIFIED:20050306T005650
+END:VTODO
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full2.vcf b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full2.vcf
new file mode 100644
index 00000000..c27e212e
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full2.vcf
@@ -0,0 +1,22 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTODO
+UID:20050306T005538Z-4378-1000-1-28@azrael
+DTSTAMP:20050306T005538Z
+SUMMARY:summary
+DUE:20050330T003000
+DTSTART:20050306T010000Z
+CLASS:PRIVATE
+CATEGORIES:Birthday\,Business
+PERCENT-COMPLETE:50
+PRIORITY:7
+URL:webpage
+SEQUENCE:2
+CREATED:20050306T005650
+LAST-MODIFIED:2005-03-06T00:56:50
+DESCRIPTION:Description
+STATUS:IN-PROCESS
+END:VTODO
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full3.vcf b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full3.vcf
new file mode 100644
index 00000000..860aed97
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full3.vcf
@@ -0,0 +1,23 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTODO
+UID:20050306T005538Z-4378-1000-1-28@azrael
+DTSTAMP:20050306T005538Z
+SUMMARY:summary
+DUE:20050330T003000
+DTSTART:20050306T010000
+CLASS:CONFIDENTIAL
+CATEGORIES:Birthday\,Business
+PERCENT-COMPLETE:100
+PRIORITY:5
+URL:webpage
+SEQUENCE:3
+CREATED:20050306T005650
+LAST-MODIFIED:20050306
+STATUS:COMPLETED
+DESCRIPTION:Description
+COMPLETED:20050306T010000Z
+END:VTODO
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full4.vcf b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full4.vcf
new file mode 100644
index 00000000..5db8583a
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full4.vcf
@@ -0,0 +1,21 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTODO
+UID:20050329T112523Z-4349-1000-1-14@craal
+DTSTAMP:20050329T112523Z
+SUMMARY:full1
+DESCRIPTION:description
+DUE;VALUE=DATE:20050101
+DTSTART;VALUE=DATE:20050102
+CLASS:PUBLIC
+CATEGORIES:Birthday\,Business
+PERCENT-COMPLETE:0
+PRIORITY:3
+URL:webpage
+SEQUENCE:1
+CREATED:20050329T112604
+LAST-MODIFIED:20050329T112604
+END:VTODO
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full5.vcf b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full5.vcf
new file mode 100644
index 00000000..c21652a9
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full5.vcf
@@ -0,0 +1,42 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTODO
+UID:20050329T112608Z-4349-1000-1-15@craal
+DTSTAMP:20050329T112608Z
+SUMMARY:full2
+DESCRIPTION:desciption2\nmulti\nline
+DUE;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050101T000000
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
+ 20050102T010000
+CLASS:PRIVATE
+CATEGORIES:Business\,Competition
+PERCENT-COMPLETE:50
+STATUS:IN-PROCESS
+PRIORITY:5
+URL:website
+SEQUENCE:1
+CREATED:20050329T112653
+LAST-MODIFIED:20050329T112653
+END:VTODO
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full6.vcf b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full6.vcf
new file mode 100644
index 00000000..72dbc93e
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full6.vcf
@@ -0,0 +1,59 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Europe/Moscow
+X-LIC-LOCATION:Europe/Moscow
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0400
+TZNAME:MSD
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0400
+TZOFFSETTO:+0300
+TZNAME:MSK
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/America/Los_Angeles
+X-LIC-LOCATION:America/Los_Angeles
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+TZNAME:PST
+DTSTART:19701025T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+TZNAME:PDT
+DTSTART:19700405T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTODO
+UID:20050329T112655Z-4349-1000-1-16@craal
+DTSTAMP:20050329T112655Z
+SUMMARY:full3
+DUE;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Moscow:
+ 20050101T000000
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/America/Los_Angeles:
+ 20050101T010000
+CLASS:CONFIDENTIAL
+PERCENT-COMPLETE:100
+STATUS:COMPLETED
+PRIORITY:7
+COMPLETED:20050108T230000Z
+URL:website
+SEQUENCE:1
+CREATED:20050329T112740
+LAST-MODIFIED:20050329T112740
+END:VTODO
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full7.vcf b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full7.vcf
new file mode 100644
index 00000000..c15d23ba
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-full7.vcf
@@ -0,0 +1,20 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTODO
+UID:20050329T112744Z-4349-1000-1-17@craal
+DTSTAMP:20050329T112744Z
+SUMMARY:full4
+DESCRIPTION:
+ desfeefä\nüöüfeü\nöüü+#+´ßß?\\=0)()/(&/%&$§\"!{[]}\\\,\;:
+ |||><jj°j
+CLASS:PUBLIC
+PERCENT-COMPLETE:0
+STATUS:CANCELLED
+PRIORITY:0
+SEQUENCE:1
+CREATED:20050329T112842
+LAST-MODIFIED:20050329T112842
+END:VTODO
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-simple.vcf b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-simple.vcf
new file mode 100644
index 00000000..1f472442
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/evolution2/todo-simple.vcf
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VTODO
+UID:20050329T112458Z-4349-1000-1-13@craal
+DTSTAMP:20050329T112458Z
+SUMMARY:simple
+CLASS:PUBLIC
+PERCENT-COMPLETE:0
+PRIORITY:0
+SEQUENCE:1
+CREATED:20050329T112521
+LAST-MODIFIED:20050329T112521
+END:VTODO
+END:VCALENDAR
diff --git a/debian/opensync/opensync-0.22/tests/data/vtodos/kdepim/todo-full1.vcs b/debian/opensync/opensync-0.22/tests/data/vtodos/kdepim/todo-full1.vcs
new file mode 100644
index 00000000..5b70b270
--- /dev/null
+++ b/debian/opensync/opensync-0.22/tests/data/vtodos/kdepim/todo-full1.vcs
@@ -0,0 +1,21 @@
+BEGIN:VCALENDAR

+PRODID:-//K Desktop Environment//NONSGML libkcal 3.2//EN

+VERSION:1.0

+BEGIN:VTODO

+DUE:20050313T010300Z

+DTSTART:20050306T010300Z

+DCREATED:20050306T010522Z

+UID:libkcal-862506927.303

+SEQUENCE:1

+X-ORGANIZER:MAILTO:[email protected]

+ATTENDEE;RSVP=TRUE;STATUS=NEEDS ACTION:MAILTO:Firstname Lastname <[email protected]>

+DESCRIPTION:Description

+SUMMARY:title

+LOCATION:location

+STATUS:NEEDS_ACTION

+PRIORITY:3

+CATEGORIES:Birthday;Business

+END:VTODO

+

+END:VCALENDAR

+