From 5d180b8858e130a651888fdbc55d2f478346da4c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 8 Oct 2015 13:20:48 +0200
Subject: [PATCH] tests: adapt to new comments dict

---
 tests/metadata/net.osmand.plus.pickle         |    4 +-
 tests/metadata/org.adaway.json                |    8 +-
 tests/metadata/org.adaway.pickle              | 2180 ++++++++---------
 tests/metadata/org.smssecure.smssecure.pickle |  908 +++----
 tests/metadata/org.videolan.vlc.pickle        |    4 +-
 5 files changed, 1551 insertions(+), 1553 deletions(-)

diff --git a/tests/metadata/net.osmand.plus.pickle b/tests/metadata/net.osmand.plus.pickle
index d11ffc8b..bab0dc72 100644
--- a/tests/metadata/net.osmand.plus.pickle
+++ b/tests/metadata/net.osmand.plus.pickle
@@ -66,7 +66,7 @@ p32
 I00
 sS'comments'
 p33
-(lp34
+(dp34
 sS'Repo Type'
 p35
 S'git'
@@ -499,4 +499,4 @@ NsS'Current Version'
 p182
 S'1.9.5'
 p183
-s.
\ No newline at end of file
+s.
diff --git a/tests/metadata/org.adaway.json b/tests/metadata/org.adaway.json
index 954b21cf..9a9e94ad 100644
--- a/tests/metadata/org.adaway.json
+++ b/tests/metadata/org.adaway.json
@@ -277,8 +277,8 @@
             "versionName": "3.0"
         }
     ],
-    "comments": [
-        ["build:40", "#RootCommands srclib needs changing on fdroidserver"],
-        ["build:42", "#RootCommands srclib needs changing on fdroidserver"]
-    ]
+    "comments": {
+        "build:40": "#RootCommands srclib needs changing on fdroidserver",
+        "build:42": "#RootCommands srclib needs changing on fdroidserver"
+    }
 }
diff --git a/tests/metadata/org.adaway.pickle b/tests/metadata/org.adaway.pickle
index d24b410a..6a7777d8 100644
--- a/tests/metadata/org.adaway.pickle
+++ b/tests/metadata/org.adaway.pickle
@@ -63,63 +63,65 @@ p31
 I01
 sS'comments'
 p32
-(lp33
-(lp34
-S'build:40'
+(dp33
+S'build:42'
+p34
+S'#RootCommands srclib needs changing on fdroidserver'
 p35
-aS'#RootCommands srclib needs changing on fdroidserver'
+sS'build:40'
 p36
-aa(lp37
-S'build:42'
+S'#RootCommands srclib needs changing on fdroidserver'
+p37
+ssS'id'
 p38
-aS'#RootCommands srclib needs changing on fdroidserver'
-p39
-aasS'id'
-p40
 S'org.adaway'
-p41
+p39
 sS'Repo'
-p42
+p40
 S'https://github.com/dschuermann/ad-away.git'
-p43
+p41
 sS'No Source Since'
-p44
+p42
 g27
 sS'Auto Name'
-p45
+p43
 S'AdAway'
-p46
+p44
 sS'Categories'
-p47
-(lp48
+p45
+(lp46
 S'System'
-p49
+p47
 aS'Security'
-p50
+p48
 asS'Source Code'
-p51
+p49
 S'https://github.com/dschuermann/ad-away'
-p52
+p50
 sS'Litecoin'
-p53
+p51
 NsS'Update Check Ignore'
-p54
+p52
 NsS'Name'
-p55
+p53
 NsS'License'
-p56
+p54
 S'GPLv3'
-p57
+p55
 sS'Changelog'
-p58
+p56
 g27
 sS'Update Check Mode'
-p59
+p57
 S'Tags'
-p60
+p58
 sS'Summary'
-p61
+p59
 S'Block advertisements'
+p60
+sS'Current Version'
+p61
+S'3.0'
 p62
 sS'Maintainer Notes'
 p63
@@ -149,15 +151,17 @@ I00
 sS'oldsdkloc'
 p76
 I00
-sS'gradleprops'
+sS'antcommands'
 p77
-(lp78
-sS'scanignore'
-p79
-(lp80
+NsS'kivy'
+p78
+I00
 sS'gradle'
-p81
+p79
 I00
+sS'scanignore'
+p80
+(lp81
 sS'srclibs'
 p82
 (lp83
@@ -177,60 +181,58 @@ sS'subdir'
 p90
 S'org_adaway/'
 p91
-sS'ndk_path'
+sS'rm'
 p92
-g27
-sS'kivy'
-p93
-I00
-sS'build'
+(lp93
+sS'type'
 p94
+S'ant'
+p95
+sS'build'
+p96
+g27
+sS'ndk_path'
+p97
 g27
 sS'forcevercode'
-p95
+p98
 I00
 sS'preassemble'
-p96
-(lp97
+p99
+(lp100
 sS'update'
-p98
-(lp99
+p101
+(lp102
 S'auto'
-p100
+p103
 asS'maven'
-p101
+p104
 I00
 sS'disable'
-p102
+p105
 I00
-sS'rm'
-p103
-(lp104
+sS'commit'
+p106
+S'ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9'
+p107
 sS'scandelete'
-p105
-(lp106
+p108
+(lp109
 sS'buildjni'
-p107
-(lp108
-S'yes'
-p109
-asS'ndk'
 p110
-S'r10e'
-p111
-sS'target'
+(lp111
+S'yes'
 p112
-NsS'type'
+asS'ndk'
 p113
-S'ant'
+S'r10e'
 p114
-sS'commit'
+sS'target'
 p115
-S'ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9'
+NsS'gradleprops'
 p116
-sS'antcommands'
-p117
-NsS'patch'
+(lp117
+sS'patch'
 p118
 (lp119
 sS'prebuild'
@@ -252,11 +254,12 @@ I00
 sg76
 I00
 sg77
-(lp125
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -266,71 +269,71 @@ sg87
 g27
 sg88
 S'1.15'
-p126
+p125
 sS'subdir'
-p127
+p126
 S'org_adaway/'
-p128
+p127
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
+I00
+sS'commit'
+p128
+S'4128e59da2eac5c2904c7c7568d298ca51e79540'
 p129
-(lp130
+sg108
 g109
-asg110
-g111
-sg112
-Nsg113
+sS'buildjni'
+p130
+(lp131
+g112
+asg113
 g114
-sS'commit'
-p131
-S'4128e59da2eac5c2904c7c7568d298ca51e79540'
+sg115
+Nsg116
+g117
+sS'patch'
 p132
-sg117
-NsS'patch'
-p133
-(lp134
+(lp133
 S'defprop.patch'
-p135
+p134
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp136
+Nsa(dp135
 g72
 I00
 sg73
 S'19'
-p137
+p136
 sg75
 I00
 sg76
 I00
 sg77
-(lp138
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -340,71 +343,71 @@ sg87
 g27
 sg88
 S'1.18'
-p139
+p137
 sS'subdir'
-p140
+p138
 S'org_adaway/'
-p141
+p139
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
+I00
+sS'commit'
+p140
+S'0b9985398b9eef7baf6aadd0dbb12002bc199d2e'
+p141
+sg108
+g109
 sS'buildjni'
 p142
 (lp143
-g109
-asg110
-g111
-sg112
-Nsg113
+g112
+asg113
 g114
-sS'commit'
+sg115
+Nsg116
+g117
+sS'patch'
 p144
-S'0b9985398b9eef7baf6aadd0dbb12002bc199d2e'
-p145
-sg117
-NsS'patch'
-p146
-(lp147
+(lp145
 S'defprop.patch'
-p148
+p146
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp149
+Nsa(dp147
 g72
 I00
 sg73
 S'20'
-p150
+p148
 sg75
 I00
 sg76
 I00
 sg77
-(lp151
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -414,71 +417,71 @@ sg87
 g27
 sg88
 S'1.19'
-p152
+p149
 sS'subdir'
-p153
+p150
 S'org_adaway/'
-p154
+p151
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p155
-(lp156
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p157
+p152
 S'ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22'
-p158
-sg117
-NsS'patch'
-p159
-(lp160
+p153
+sg108
+g109
+sS'buildjni'
+p154
+(lp155
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'patch'
+p156
+(lp157
 S'defprop.patch'
-p161
+p158
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp162
+Nsa(dp159
 g72
 I00
 sg73
 S'21'
-p163
+p160
 sg75
 I00
 sg76
 I00
 sg77
-(lp164
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -488,71 +491,71 @@ sg87
 g27
 sg88
 S'1.20'
-p165
+p161
 sS'subdir'
-p166
+p162
 S'org_adaway/'
-p167
+p163
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
+I00
+sS'commit'
+p164
+S'695e3801e4081026c8f7213a2345fc451d5eb89c'
+p165
+sg108
+g109
 sS'buildjni'
+p166
+(lp167
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'patch'
 p168
 (lp169
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
-sS'commit'
-p170
-S'695e3801e4081026c8f7213a2345fc451d5eb89c'
-p171
-sg117
-NsS'patch'
-p172
-(lp173
 S'defprop.patch'
-p174
+p170
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp175
+Nsa(dp171
 g72
 I00
 sg73
 S'22'
-p176
+p172
 sg75
 I00
 sg76
 I00
 sg77
-(lp177
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -562,71 +565,71 @@ sg87
 g27
 sg88
 S'1.21'
-p178
+p173
 sS'subdir'
-p179
+p174
 S'org_adaway/'
-p180
+p175
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p181
-(lp182
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p183
+p176
 S'65138c11cc8b6affd28b68e125fbc1dff0886a4e'
-p184
-sg117
-NsS'patch'
-p185
-(lp186
+p177
+sg108
+g109
+sS'buildjni'
+p178
+(lp179
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'patch'
+p180
+(lp181
 S'defprop.patch'
-p187
+p182
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp188
+Nsa(dp183
 g72
 I00
 sg73
 S'24'
-p189
+p184
 sg75
 I00
 sg76
 I00
 sg77
-(lp190
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -636,67 +639,67 @@ sg87
 g27
 sg88
 S'1.23'
-p191
+p185
 sS'subdir'
-p192
+p186
 Nsg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
+I00
+sg99
+g100
 sg101
+g102
+sg104
 I00
 sS'disable'
-p193
+p187
 S'no source in repo'
-p194
-sg103
-g104
-sg105
-g106
-sS'buildjni'
-p195
-(lp196
-sg110
-g111
-sg112
-Nsg113
-g114
+p188
 sS'commit'
-p197
+p189
 S'unknown - see disabled'
-p198
-sg117
-Nsg118
+p190
+sg108
+g109
+sS'buildjni'
+p191
+(lp192
+sg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sg120
 g27
 sg121
 I00
 sg122
-Nsa(dp199
+Nsa(dp193
 g72
 I00
 sg73
 S'25'
-p200
+p194
 sg75
 I00
 sg76
 I00
 sg77
-(lp201
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -706,70 +709,70 @@ sg87
 g27
 sg88
 S'1.24'
-p202
+p195
 sS'subdir'
-p203
+p196
 S'org_adaway/'
-p204
+p197
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p205
-(lp206
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p207
+p198
 S'f811e53e1e1d2ee047b18715fd7d2072b90ae76b'
-p208
-sg117
-Nsg118
+p199
+sg108
+g109
+sS'buildjni'
+p200
+(lp201
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p209
+p202
 S'android update project -p ../com_actionbarsherlock'
-p210
+p203
 sg121
 I00
 sg122
-Nsa(dp211
+Nsa(dp204
 g72
 I00
 sg73
 S'26'
-p212
+p205
 sg75
 I00
 sg76
 I00
 sg77
-(lp213
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -779,70 +782,70 @@ sg87
 g27
 sg88
 S'1.25'
-p214
+p206
 sS'subdir'
-p215
+p207
 S'org_adaway/'
-p216
+p208
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p217
-(lp218
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p219
+p209
 S'ff97932761cdee68638dc2550751a64b2cbe18e7'
-p220
-sg117
-Nsg118
+p210
+sg108
+g109
+sS'buildjni'
+p211
+(lp212
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p221
+p213
 S'android update project -p ../com_actionbarsherlock'
-p222
+p214
 sg121
 I00
 sg122
-Nsa(dp223
+Nsa(dp215
 g72
 I00
 sg73
 S'27'
-p224
+p216
 sg75
 I00
 sg76
 I00
 sg77
-(lp225
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -852,70 +855,70 @@ sg87
 g27
 sg88
 S'1.26'
-p226
+p217
 sS'subdir'
-p227
+p218
 S'org_adaway/'
-p228
+p219
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p229
-(lp230
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p231
+p220
 S'33d4d80998f30bafc88c04c80cbae00b03916f99'
-p232
-sg117
-Nsg118
+p221
+sg108
+g109
+sS'buildjni'
+p222
+(lp223
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p233
+p224
 S'android update project -p ../com_actionbarsherlock'
-p234
+p225
 sg121
 I00
 sg122
-Nsa(dp235
+Nsa(dp226
 g72
 I00
 sg73
 S'28'
-p236
+p227
 sg75
 I00
 sg76
 I00
 sg77
-(lp237
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -925,70 +928,70 @@ sg87
 g27
 sg88
 S'1.27'
-p238
+p228
 sS'subdir'
-p239
+p229
 S'org_adaway/'
-p240
+p230
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p241
-(lp242
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p243
+p231
 S'743d25a7e287505461f33f4b8e57e4cf988fffea'
-p244
-sg117
-Nsg118
+p232
+sg108
+g109
+sS'buildjni'
+p233
+(lp234
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p245
+p235
 S'android update project -p ../com_actionbarsherlock'
-p246
+p236
 sg121
 I00
 sg122
-Nsa(dp247
+Nsa(dp237
 g72
 I00
 sg73
 S'30'
-p248
+p238
 sg75
 I00
 sg76
 I00
 sg77
-(lp249
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -998,70 +1001,70 @@ sg87
 g27
 sg88
 S'1.29'
-p250
+p239
 sS'subdir'
-p251
+p240
 S'org_adaway/'
-p252
+p241
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p253
-(lp254
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p255
+p242
 S'eaa07f4'
-p256
-sg117
-Nsg118
+p243
+sg108
+g109
+sS'buildjni'
+p244
+(lp245
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p257
+p246
 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*'
-p258
+p247
 sg121
 I00
 sg122
-Nsa(dp259
+Nsa(dp248
 g72
 I00
 sg73
 S'33'
-p260
+p249
 sg75
 I00
 sg76
 I00
 sg77
-(lp261
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -1071,71 +1074,71 @@ sg87
 g27
 sg88
 S'1.32'
-p262
+p250
 sS'subdir'
-p263
+p251
 S'org_adaway/'
-p264
+p252
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
+I00
+sS'commit'
+p253
+S'71ced3f'
+p254
+sg108
+g109
 sS'buildjni'
-p265
-(lp266
+p255
+(lp256
 S'no'
-p267
-asg110
-g111
-sg112
-Nsg113
+p257
+asg113
 g114
-sS'commit'
-p268
-S'71ced3f'
-p269
-sg117
-Nsg118
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p270
+p258
 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && rm libs/android-support-v4.jar'
-p271
+p259
 sg121
 I00
 sg122
-Nsa(dp272
+Nsa(dp260
 g72
 I00
 sg73
 S'34'
-p273
+p261
 sg75
 I00
 sg76
 I00
 sg77
-(lp274
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -1145,70 +1148,70 @@ sg87
 g27
 sg88
 S'1.33'
-p275
+p262
 sS'subdir'
-p276
+p263
 S'org_adaway/'
-p277
+p264
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p278
-(lp279
-g267
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p280
+p265
 S'9d63c18'
-p281
-sg117
-Nsg118
+p266
+sg108
+g109
+sS'buildjni'
+p267
+(lp268
+g257
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p282
+p269
 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*'
-p283
+p270
 sg121
 I00
 sg122
-Nsa(dp284
+Nsa(dp271
 g72
 I00
 sg73
 S'35'
-p285
+p272
 sg75
 I00
 sg76
 I00
 sg77
-(lp286
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -1218,70 +1221,70 @@ sg87
 g27
 sg88
 S'1.34'
-p287
+p273
 sS'subdir'
-p288
+p274
 S'org_adaway/'
-p289
+p275
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p290
-(lp291
-g267
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p292
+p276
 S'f2568b1'
-p293
-sg117
-Nsg118
+p277
+sg108
+g109
+sS'buildjni'
+p278
+(lp279
+g257
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p294
+p280
 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations'
-p295
+p281
 sg121
 I00
 sg122
-Nsa(dp296
+Nsa(dp282
 g72
 I00
 sg73
 S'36'
-p297
+p283
 sg75
 I00
 sg76
 I00
 sg77
-(lp298
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -1291,70 +1294,70 @@ sg87
 g27
 sg88
 S'1.35'
-p299
+p284
 sS'subdir'
-p300
+p285
 S'org_adaway/'
-p301
+p286
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p302
-(lp303
-g267
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p304
+p287
 S'7442d5d'
-p305
-sg117
-Nsg118
+p288
+sg108
+g109
+sS'buildjni'
+p289
+(lp290
+g257
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p306
+p291
 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations'
-p307
+p292
 sg121
 I00
 sg122
-Nsa(dp308
+Nsa(dp293
 g72
 I00
 sg73
 S'37'
-p309
+p294
 sg75
 I00
 sg76
 I00
 sg77
-(lp310
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -1364,70 +1367,70 @@ sg87
 g27
 sg88
 S'1.36'
-p311
+p295
 sS'subdir'
-p312
+p296
 S'org_adaway/'
-p313
+p297
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p314
-(lp315
-g267
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p316
+p298
 S'83fc713'
-p317
-sg117
-Nsg118
+p299
+sg108
+g109
+sS'buildjni'
+p300
+(lp301
+g257
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p318
+p302
 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations'
-p319
+p303
 sg121
 I00
 sg122
-Nsa(dp320
+Nsa(dp304
 g72
 I00
 sg73
 S'38'
-p321
+p305
 sg75
 I00
 sg76
 I00
 sg77
-(lp322
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sg82
 g83
 sg84
@@ -1437,249 +1440,249 @@ sg87
 g27
 sg88
 S'1.37'
-p323
+p306
 sS'subdir'
-p324
+p307
 S'org_adaway/'
-p325
+p308
 sg92
-g27
-sg93
-I00
+g93
 sg94
-g27
-sg95
-I00
+g95
 sg96
-g97
+g27
+sg97
+g27
 sg98
-g99
-sg101
 I00
-sg102
+sg99
+g100
+sg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p326
-(lp327
-g267
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p328
+p309
 S'70da32b567122b701cdcb1609b780eb85732028f'
-p329
-sg117
-Nsg118
+p310
+sg108
+g109
+sS'buildjni'
+p311
+(lp312
+g257
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p330
+p313
 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations'
-p331
+p314
 sg121
 I00
 sg122
-Nsa(dp332
+Nsa(dp315
 g72
 I00
 sg73
 S'40'
-p333
+p316
 sg75
 I00
 sg76
 I00
 sg77
-(lp334
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sS'srclibs'
-p335
-(lp336
+p317
+(lp318
 S'RootCommands@c940b0e503'
-p337
+p319
 asg84
 NsS'extlibs'
-p338
-(lp339
+p320
+(lp321
 S'htmlcleaner/htmlcleaner-2.2.jar'
-p340
+p322
 asS'init'
-p341
+p323
 S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner'
-p342
+p324
 sg88
 S'2.1'
-p343
+p325
 sS'subdir'
-p344
+p326
 S'AdAway'
-p345
+p327
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g95
+sg96
+g27
+sg97
 g27
-sg95
+sg98
 I00
-sg96
-g97
+sg99
+g100
 sS'update'
-p346
-(lp347
+p328
+(lp329
 S'.'
-p348
+p330
 aS'android-libs/Donations'
-p349
+p331
 aS'android-libs/ActionBarSherlock'
-p350
+p332
 aS'android-libs/HtmlSpanner/htmlspanner'
-p351
-asg101
-I00
-sg102
+p333
+asg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p352
-(lp353
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p354
+p334
 S'v2.1'
-p355
-sg117
-Nsg118
+p335
+sg108
+g109
+sS'buildjni'
+p336
+(lp337
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p356
+p338
 S'rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && echo "android.library.reference.3=$$RootCommands$$" >> project.properties && echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties && find . -type f -print0 | xargs -0 sed -i \'s/org.rootcommands/org.sufficientlysecure.rootcommands/g\' && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/'
-p357
+p339
 sg121
 I00
 sg122
-Nsa(dp358
+Nsa(dp340
 g72
 I00
 sg73
 S'42'
-p359
+p341
 sg75
 I00
 sg76
 I00
 sg77
-(lp360
+Nsg78
+I00
 sg79
-g80
-sg81
 I00
+sg80
+g81
 sS'srclibs'
-p361
-(lp362
+p342
+(lp343
 S'RootCommands@c940b0e503'
-p363
+p344
 asg84
 NsS'extlibs'
-p364
-(lp365
+p345
+(lp346
 S'htmlcleaner/htmlcleaner-2.2.jar'
-p366
+p347
 asS'init'
-p367
+p348
 S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner'
-p368
+p349
 sg88
 S'2.3'
-p369
+p350
 sS'subdir'
-p370
+p351
 S'AdAway'
-p371
+p352
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g95
+sg96
 g27
-sg95
+sg97
+g27
+sg98
 I00
-sg96
-g97
+sg99
+g100
 sS'update'
-p372
-(lp373
-g348
+p353
+(lp354
+g330
 aS'android-libs/Donations'
-p374
+p355
 aS'android-libs/ActionBarSherlock'
-p375
+p356
 aS'android-libs/HtmlSpanner/htmlspanner'
-p376
-asg101
-I00
-sg102
+p357
+asg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p377
-(lp378
-g109
-asg110
-g111
-sg112
-Nsg113
-g114
+I00
 sS'commit'
-p379
+p358
 S'v2.3'
-p380
-sg117
-Nsg118
+p359
+sg108
+g109
+sS'buildjni'
+p360
+(lp361
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sg118
 g119
 sS'prebuild'
-p381
+p362
 S'rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && echo "android.library.reference.3=$$RootCommands$$" >> project.properties && echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties && find . -type f -print0 | xargs -0 sed -i \'s/org.rootcommands/org.sufficientlysecure.rootcommands/g\' && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/'
-p382
+p363
 sg121
 I00
 sg122
-Nsa(dp383
+Nsa(dp364
 g72
 I00
 sg73
 S'45'
-p384
+p365
 sg75
 I00
 sg76
 I00
 sg77
-(lp385
-sg79
-g80
+Nsg78
+I00
 sg118
 g119
+sg80
+g81
 sg82
 g83
 sg84
@@ -1689,73 +1692,73 @@ sg87
 g27
 sg88
 S'2.6'
-p386
+p366
 sS'subdir'
-p387
+p367
 S'AdAway'
-p388
+p368
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g79
+sg96
+g27
+sg97
 g27
-sg95
+sg98
 I00
 sS'preassemble'
-p389
-(lp390
+p369
+(lp370
 S'renameExecutables'
-p391
-asg98
-g99
-sg101
-I00
-sg102
+p371
+asg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p392
-(lp393
-g109
-asg110
-g111
-sg112
-Nsg113
-g81
+I00
 sS'commit'
-p394
+p372
 S'v2.6'
-p395
-sg117
-NsS'gradle'
-p396
-(lp397
+p373
+sg108
 g109
+sS'buildjni'
+p374
+(lp375
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'gradle'
+p376
+(lp377
+g112
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp398
+Nsa(dp378
 g72
 I00
 sg73
 S'46'
-p399
+p379
 sg75
 I00
 sg76
 I00
 sg77
-(lp400
-sg79
-g80
+Nsg78
+I00
 sg118
 g119
+sg80
+g81
 sg82
 g83
 sg84
@@ -1765,73 +1768,73 @@ sg87
 g27
 sg88
 S'2.7'
-p401
+p380
 sS'subdir'
-p402
+p381
 S'AdAway'
-p403
+p382
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g79
+sg96
 g27
-sg95
+sg97
+g27
+sg98
 I00
 sS'preassemble'
-p404
-(lp405
+p383
+(lp384
 S'renameExecutables'
-p406
-asg98
-g99
-sg101
-I00
-sg102
+p385
+asg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p407
-(lp408
-g109
-asg110
-g111
-sg112
-Nsg113
-g81
+I00
 sS'commit'
-p409
+p386
 S'v2.7'
-p410
-sg117
-NsS'gradle'
-p411
-(lp412
+p387
+sg108
 g109
+sS'buildjni'
+p388
+(lp389
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'gradle'
+p390
+(lp391
+g112
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp413
+Nsa(dp392
 g72
 I00
 sg73
 S'47'
-p414
+p393
 sg75
 I00
 sg76
 I00
 sg77
-(lp415
-sg79
-g80
+Nsg78
+I00
 sg118
 g119
+sg80
+g81
 sg82
 g83
 sg84
@@ -1841,73 +1844,73 @@ sg87
 g27
 sg88
 S'2.8'
-p416
+p394
 sS'subdir'
-p417
+p395
 S'AdAway'
-p418
+p396
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g79
+sg96
 g27
-sg95
+sg97
+g27
+sg98
 I00
 sS'preassemble'
-p419
-(lp420
+p397
+(lp398
 S'renameExecutables'
-p421
-asg98
-g99
-sg101
-I00
-sg102
+p399
+asg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p422
-(lp423
-g109
-asg110
-g111
-sg112
-Nsg113
-g81
+I00
 sS'commit'
-p424
+p400
 S'v2.8'
-p425
-sg117
-NsS'gradle'
-p426
-(lp427
+p401
+sg108
 g109
+sS'buildjni'
+p402
+(lp403
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'gradle'
+p404
+(lp405
+g112
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp428
+Nsa(dp406
 g72
 I00
 sg73
 S'48'
-p429
+p407
 sg75
 I00
 sg76
 I00
 sg77
-(lp430
-sg79
-g80
+Nsg78
+I00
 sg118
 g119
+sg80
+g81
 sg82
 g83
 sg84
@@ -1917,73 +1920,73 @@ sg87
 g27
 sg88
 S'2.8.1'
-p431
+p408
 sS'subdir'
-p432
+p409
 S'AdAway'
-p433
+p410
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g79
+sg96
 g27
-sg95
+sg97
+g27
+sg98
 I00
 sS'preassemble'
-p434
-(lp435
+p411
+(lp412
 S'renameExecutables'
-p436
-asg98
-g99
-sg101
-I00
-sg102
+p413
+asg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p437
-(lp438
-g109
-asg110
-g111
-sg112
-Nsg113
-g81
+I00
 sS'commit'
-p439
+p414
 S'v2.8.1'
-p440
-sg117
-NsS'gradle'
-p441
-(lp442
+p415
+sg108
 g109
+sS'buildjni'
+p416
+(lp417
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'gradle'
+p418
+(lp419
+g112
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp443
+Nsa(dp420
 g72
 I00
 sg73
 S'49'
-p444
+p421
 sg75
 I00
 sg76
 I00
 sg77
-(lp445
-sg79
-g80
+Nsg78
+I00
 sg118
 g119
+sg80
+g81
 sg82
 g83
 sg84
@@ -1993,73 +1996,73 @@ sg87
 g27
 sg88
 S'2.9'
-p446
+p422
 sS'subdir'
-p447
+p423
 S'AdAway'
-p448
+p424
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g79
+sg96
+g27
+sg97
 g27
-sg95
+sg98
 I00
 sS'preassemble'
-p449
-(lp450
+p425
+(lp426
 S'renameExecutables'
-p451
-asg98
-g99
-sg101
-I00
-sg102
+p427
+asg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p452
-(lp453
-g109
-asg110
-g111
-sg112
-Nsg113
-g81
+I00
 sS'commit'
-p454
+p428
 S'v2.9'
-p455
-sg117
-NsS'gradle'
-p456
-(lp457
+p429
+sg108
 g109
+sS'buildjni'
+p430
+(lp431
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'gradle'
+p432
+(lp433
+g112
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp458
+Nsa(dp434
 g72
 I00
 sg73
 S'50'
-p459
+p435
 sg75
 I00
 sg76
 I00
 sg77
-(lp460
-sg79
-g80
+Nsg78
+I00
 sg118
 g119
+sg80
+g81
 sg82
 g83
 sg84
@@ -2069,73 +2072,73 @@ sg87
 g27
 sg88
 S'2.9.1'
-p461
+p436
 sS'subdir'
-p462
+p437
 S'AdAway'
-p463
+p438
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g79
+sg96
 g27
-sg95
+sg97
+g27
+sg98
 I00
 sS'preassemble'
-p464
-(lp465
+p439
+(lp440
 S'renameExecutables'
-p466
-asg98
-g99
-sg101
-I00
-sg102
+p441
+asg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p467
-(lp468
-g109
-asg110
-g111
-sg112
-Nsg113
-g81
+I00
 sS'commit'
-p469
+p442
 S'v2.9.1'
-p470
-sg117
-NsS'gradle'
-p471
-(lp472
+p443
+sg108
 g109
+sS'buildjni'
+p444
+(lp445
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'gradle'
+p446
+(lp447
+g112
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp473
+Nsa(dp448
 g72
 I00
 sg73
 S'51'
-p474
+p449
 sg75
 I00
 sg76
 I00
 sg77
-(lp475
-sg79
-g80
+Nsg78
+I00
 sg118
 g119
+sg80
+g81
 sg82
 g83
 sg84
@@ -2145,73 +2148,73 @@ sg87
 g27
 sg88
 S'2.9.2'
-p476
+p450
 sS'subdir'
-p477
+p451
 S'AdAway'
-p478
+p452
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g79
+sg96
 g27
-sg95
+sg97
+g27
+sg98
 I00
 sS'preassemble'
-p479
-(lp480
+p453
+(lp454
 S'renameExecutables'
-p481
-asg98
-g99
-sg101
-I00
-sg102
+p455
+asg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p482
-(lp483
-g109
-asg110
-g111
-sg112
-Nsg113
-g81
+I00
 sS'commit'
-p484
+p456
 S'v2.9.2'
-p485
-sg117
-NsS'gradle'
-p486
-(lp487
+p457
+sg108
 g109
+sS'buildjni'
+p458
+(lp459
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'gradle'
+p460
+(lp461
+g112
 asg120
 g27
 sg121
 I00
 sg122
-Nsa(dp488
+Nsa(dp462
 g72
 I00
 sg73
 S'52'
-p489
+p463
 sg75
 I00
 sg76
 I00
 sg77
-(lp490
-sg79
-g80
+Nsg78
+I00
 sg118
 g119
+sg80
+g81
 sg82
 g83
 sg84
@@ -2221,73 +2224,68 @@ sg87
 g27
 sg88
 S'3.0'
-p491
+p464
 sS'subdir'
-p492
+p465
 S'AdAway'
-p493
+p466
 sg92
-g27
-sg93
-I00
+g93
 sg94
+g79
+sg96
 g27
-sg95
+sg97
+g27
+sg98
 I00
 sS'preassemble'
-p494
-(lp495
+p467
+(lp468
 S'renameExecutables'
-p496
-asg98
-g99
-sg101
-I00
-sg102
+p469
+asg101
+g102
+sg104
 I00
-sg103
-g104
 sg105
-g106
-sS'buildjni'
-p497
-(lp498
-g109
-asg110
-g111
-sg112
-Nsg113
-g81
+I00
 sS'commit'
-p499
+p470
 S'v3.0'
-p500
-sg117
-NsS'gradle'
-p501
-(lp502
+p471
+sg108
 g109
+sS'buildjni'
+p472
+(lp473
+g112
+asg113
+g114
+sg115
+Nsg116
+g117
+sS'gradle'
+p474
+(lp475
+g112
 asg120
 g27
 sg121
 I00
 sg122
 NsasS'FlattrID'
-p503
+p476
 S'369138'
-p504
+p477
 sS'metadatapath'
-p505
+p478
 S'metadata/org.adaway.json'
-p506
+p479
 sS'Disabled'
-p507
+p480
 NsS'Update Check Name'
-p508
+p481
 NsS'Vercode Operation'
-p509
-NsS'Current Version'
-p510
-S'3.0'
-p511
-s.
\ No newline at end of file
+p482
+Ns.
\ No newline at end of file
diff --git a/tests/metadata/org.smssecure.smssecure.pickle b/tests/metadata/org.smssecure.smssecure.pickle
index e181a9e0..de095d93 100644
--- a/tests/metadata/org.smssecure.smssecure.pickle
+++ b/tests/metadata/org.smssecure.smssecure.pickle
@@ -50,7 +50,7 @@ p25
 I00
 sS'comments'
 p26
-(lp27
+(dp27
 sS'id'
 p28
 S'org.smssecure.smssecure'
@@ -96,680 +96,680 @@ sS'Summary'
 p48
 S'Send encrypted text messages (SMS)'
 p49
-sS'Maintainer Notes'
+sS'Current Version'
 p50
-(lp51
-sS'Current Version Code'
+S'0.6.0'
+p51
+sS'Maintainer Notes'
 p52
+(lp53
+sS'Current Version Code'
+p54
 S'102'
-p53
+p55
 sS'Binaries'
-p54
+p56
 NsS'Archive Policy'
-p55
+p57
 NsS'builds'
-p56
-(lp57
-(dp58
+p58
+(lp59
+(dp60
 S'submodules'
-p59
+p61
 I00
 sS'vercode'
-p60
+p62
 S'5'
-p61
+p63
 sS'forceversion'
-p62
+p64
 I00
 sS'oldsdkloc'
-p63
+p65
 I00
 sS'antcommands'
-p64
-NsS'scanignore'
-p65
-(lp66
-sS'patch'
+p66
+NsS'kivy'
 p67
-(lp68
+I00
+sS'patch'
+p68
+(lp69
+sS'scanignore'
+p70
+(lp71
 sS'srclibs'
-p69
-(lp70
+p72
+(lp73
 S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278'
-p71
+p74
 aS'PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc'
-p72
+p75
 aS'ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87'
-p73
+p76
 aS'AospMms@android-5.1.0_r3'
-p74
+p77
 asS'encoding'
-p75
-NsS'extlibs'
-p76
-(lp77
-sS'init'
 p78
-g19
-sS'version'
+NsS'extlibs'
 p79
-S'0.3.3'
-p80
-sS'build'
+(lp80
+sS'init'
 p81
 g19
-sS'rm'
+sS'version'
 p82
-(lp83
-S'libs/*'
+S'0.3.3'
+p83
+sS'subdir'
 p84
-asS'kivy'
+NsS'rm'
 p85
-I00
-sS'subdir'
-p86
-NsS'forcevercode'
+(lp86
+S'libs/*'
 p87
+asS'type'
+p88
+S'gradle'
+p89
+sS'build'
+p90
+g19
+sS'ndk_path'
+p91
+g19
+sS'forcevercode'
+p92
 I01
 sS'preassemble'
-p88
-(lp89
+p93
+(lp94
 sS'update'
-p90
-(lp91
+p95
+(lp96
 S'auto'
-p92
+p97
 asS'maven'
-p93
+p98
 I00
 sS'disable'
-p94
-S'builds, merge changes into upstream'
-p95
-sS'ndk_path'
-p96
-g19
-sS'scandelete'
-p97
-(lp98
-sS'buildjni'
 p99
-(lp100
-sS'ndk'
+S'builds, merge changes into upstream'
+p100
+sS'commit'
 p101
-S'r10e'
+S'66367479a4f57f347b5cbe8f6f8f632adaae7727'
 p102
-sS'target'
+sS'scandelete'
 p103
-NsS'type'
-p104
-S'gradle'
+(lp104
+sS'buildjni'
 p105
-sS'commit'
-p106
-S'66367479a4f57f347b5cbe8f6f8f632adaae7727'
+(lp106
+sS'ndk'
 p107
-sS'gradleprops'
+S'r10e'
 p108
-(lp109
-sS'gradle'
+sS'target'
+p109
+NsS'gradleprops'
 p110
 (lp111
-S'yes'
+sS'gradle'
 p112
+(lp113
+S'yes'
+p114
 asS'prebuild'
-p113
+p115
 S"touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/"
-p114
+p116
 sS'novcheck'
-p115
+p117
 I00
 sS'output'
-p116
-Nsa(dp117
-S'submodules'
 p118
+Nsa(dp119
+S'submodules'
+p120
 I01
-sg60
-S'6'
-p119
 sg62
+S'6'
+p121
+sg64
 I00
-sg63
+sg65
 I00
-sg64
-Nsg65
-g66
-sg67
-g68
+sg66
+Nsg67
+I00
+sg68
+g69
+sg70
+g71
 sS'srclibs'
-p120
-(lp121
-S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278'
 p122
-asg75
-Nsg76
-g77
-sg78
-g19
-sg79
-S'0.3.3'
-p123
+(lp123
+S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278'
+p124
+asg78
+Nsg79
+g80
 sg81
 g19
-sS'rm'
-p124
-(lp125
-S'libs/*.jar'
+sg82
+S'0.3.3'
+p125
+sg84
+NsS'rm'
 p126
-asg85
-I00
-sg86
-NsS'forcevercode'
-p127
-I00
-sg88
+(lp127
+S'libs/*.jar'
+p128
+asg88
 g89
 sg90
-g91
+g19
+sg91
+g19
+sS'forcevercode'
+p129
+I00
 sg93
+g94
+sg95
+g96
+sg98
 I00
 sS'disable'
-p128
+p130
 S'builds, wait for upstream'
-p129
-sg96
-g19
-sg97
-g98
-sg99
-g100
-sg101
-g102
-sg103
-Nsg104
-g105
+p131
 sS'commit'
-p130
+p132
 S'9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a'
-p131
-sg108
-(lp132
-sS'gradle'
 p133
-(lp134
-g112
+sg103
+g104
+sg105
+g106
+sg107
+g108
+sg109
+Nsg110
+g111
+sS'gradle'
+p134
+(lp135
+g114
 asS'prebuild'
-p135
-S'touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar'
 p136
-sg115
+S'touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar'
+p137
+sg117
 I00
-sg116
-Nsa(dp137
+sg118
+Nsa(dp138
 S'submodules'
-p138
-I01
-sg60
-S'9'
 p139
+I01
 sg62
+S'9'
+p140
+sg64
 I00
-sg63
+sg65
 I00
-sg64
-Nsg65
-g66
-sg67
-g68
+sg66
+Nsg67
+I00
+sg68
+g69
+sg70
+g71
 sS'srclibs'
-p140
-(lp141
-sg75
-Nsg76
-g77
+p141
+(lp142
 sg78
-g19
-sg79
-S'0.4.2'
-p142
+Nsg79
+g80
 sg81
 g19
-sS'rm'
+sg82
+S'0.4.2'
 p143
-(lp144
+sg84
+NsS'rm'
+p144
+(lp145
 S'libs/*.jar'
-p145
-asg85
-I00
-sg86
-Nsg127
-I00
-sg88
+p146
+asg88
 g89
 sg90
-g91
+g19
+sg91
+g19
+sg129
+I00
 sg93
+g94
+sg95
+g96
+sg98
 I00
 sS'disable'
-p146
-S'builds locally, but not on BS'
 p147
-sg96
-g19
-sg97
-g98
-sg99
-g100
-sg101
-g102
-sg103
-Nsg104
-g105
-sS'commit'
+S'builds locally, but not on BS'
 p148
-S'v0.4.2'
+sS'commit'
 p149
-sg108
-(lp150
+S'v0.4.2'
+p150
+sg103
+g104
+sg105
+g106
+sg107
+g108
+sg109
+Nsg110
+g111
 sS'gradle'
 p151
 (lp152
-g112
+g114
 asS'prebuild'
 p153
 S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties'
 p154
-sg115
+sg117
 I00
-sg116
+sg118
 Nsa(dp155
 S'submodules'
 p156
 I01
-sg60
+sg62
 S'11'
 p157
-sg62
+sg64
 I00
-sg63
+sg65
 I00
-sg64
-Nsg65
-g66
-sg67
-g68
-sg140
-g141
-sg75
-Nsg76
-g77
+sg66
+Nsg67
+I00
+sg68
+g69
+sg70
+g71
+sg141
+g142
 sg78
+Nsg79
+g80
+sg81
 g19
-sg79
+sg82
 S'0.5.1'
 p158
-sg81
-g19
-sS'rm'
+sg84
+NsS'rm'
 p159
 (lp160
 S'libs/*.jar'
 p161
-asg85
-I00
-sg86
-Nsg127
-I00
-sg88
+asg88
 g89
 sg90
-g91
+g19
+sg91
+g19
+sg129
+I00
 sg93
+g94
+sg95
+g96
+sg98
 I00
 sS'disable'
 p162
 I00
-sg96
-g19
-sg97
-g98
-sg99
-g100
-sg101
-g102
-sg103
-Nsg104
-g105
 sS'commit'
 p163
 S'v0.5.1'
 p164
-sg108
-(lp165
+sg103
+g104
+sg105
+g106
+sg107
+g108
+sg109
+Nsg110
+g111
 sS'gradle'
-p166
-(lp167
-g112
+p165
+(lp166
+g114
 asS'prebuild'
-p168
+p167
 S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties'
-p169
-sg115
+p168
+sg117
 I00
-sg116
-Nsa(dp170
+sg118
+Nsa(dp169
 S'submodules'
-p171
+p170
 I01
-sg60
-S'12'
-p172
 sg62
+S'12'
+p171
+sg64
 I00
-sg63
+sg65
 I00
-sg64
-Nsg65
-g66
-sg67
-g68
-sg140
-g141
-sg75
-Nsg76
-g77
+sg66
+Nsg67
+I00
+sg68
+g69
+sg70
+g71
+sg141
+g142
 sg78
+Nsg79
+g80
+sg81
 g19
-sg79
+sg82
 S'0.5.2'
+p172
+sg84
+NsS'rm'
 p173
-sg81
-g19
-sS'rm'
-p174
-(lp175
+(lp174
 S'libs/*.jar'
-p176
-asg85
-I00
-sg86
-Nsg127
-I00
-sg88
+p175
+asg88
 g89
 sg90
-g91
+g19
+sg91
+g19
+sg129
+I00
 sg93
+g94
+sg95
+g96
+sg98
 I00
 sS'disable'
-p177
+p176
 S'broken in upstream'
-p178
-sg96
-g19
-sg97
-g98
-sg99
-g100
-sg101
-g102
-sg103
-Nsg104
-g105
+p177
 sS'commit'
-p179
+p178
 S'v0.5.2'
+p179
+sg103
+g104
+sg105
+g106
+sg107
+g108
+sg109
+Nsg110
+g111
+sS'gradle'
 p180
-sg108
 (lp181
-sS'gradle'
-p182
-(lp183
-g112
+g114
 asS'prebuild'
-p184
+p182
 S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build'
-p185
-sg115
+p183
+sg117
 I00
-sg116
-Nsa(dp186
+sg118
+Nsa(dp184
 S'submodules'
-p187
+p185
 I01
-sg60
-S'100'
-p188
 sg62
+S'100'
+p186
+sg64
 I00
-sg63
+sg65
 I00
-sg64
-Nsg65
-g66
-sg67
-g68
-sg140
-g141
-sg75
-Nsg76
-g77
+sg66
+Nsg67
+I00
+sg68
+g69
+sg70
+g71
+sg141
+g142
 sg78
-g19
-sg79
-S'0.5.3'
-p189
+Nsg79
+g80
 sg81
 g19
-sS'rm'
-p190
-(lp191
+sg82
+S'0.5.3'
+p187
+sg84
+NsS'rm'
+p188
+(lp189
 S'libs/*.jar'
-p192
-asg85
-I00
-sg86
-Nsg127
-I00
-sg88
+p190
+asg88
 g89
 sg90
-g91
+g19
+sg91
+g19
+sg129
+I00
 sg93
+g94
+sg95
+g96
+sg98
 I00
 sg162
 I00
-sg96
-g19
-sg97
-g98
-sg99
-g100
-sg101
-g102
-sg103
-Nsg104
-g105
 sS'commit'
-p193
+p191
 S'v0.5.3'
-p194
-sg108
-(lp195
+p192
+sg103
+g104
+sg105
+g106
+sg107
+g108
+sg109
+Nsg110
+g111
 sS'gradle'
-p196
-(lp197
-g112
+p193
+(lp194
+g114
 asS'prebuild'
-p198
+p195
 S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build'
-p199
-sg115
+p196
+sg117
 I00
-sg116
-Nsa(dp200
+sg118
+Nsa(dp197
 S'submodules'
-p201
+p198
 I01
-sg60
-S'101'
-p202
 sg62
+S'101'
+p199
+sg64
 I00
-sg63
+sg65
 I00
-sg64
-Nsg65
-g66
-sg67
-g68
-sg140
-g141
-sg75
-Nsg76
-g77
+sg66
+Nsg67
+I00
+sg68
+g69
+sg70
+g71
+sg141
+g142
 sg78
-g19
-sg79
-S'0.5.4'
-p203
+Nsg79
+g80
 sg81
 g19
-sS'rm'
-p204
-(lp205
+sg82
+S'0.5.4'
+p200
+sg84
+NsS'rm'
+p201
+(lp202
 S'libs/*.jar'
-p206
-asg85
-I00
-sg86
-Nsg127
-I00
-sg88
+p203
+asg88
 g89
 sg90
-g91
+g19
+sg91
+g19
+sg129
+I00
 sg93
+g94
+sg95
+g96
+sg98
 I00
 sg162
 I00
-sg96
-g19
-sg97
-g98
-sg99
-g100
-sg101
-g102
-sg103
-Nsg104
-g105
 sS'commit'
-p207
+p204
 S'v0.5.4'
-p208
-sg108
-(lp209
+p205
+sg103
+g104
+sg105
+g106
+sg107
+g108
+sg109
+Nsg110
+g111
 sS'gradle'
-p210
-(lp211
-g112
+p206
+(lp207
+g114
 asS'prebuild'
-p212
+p208
 S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build'
-p213
-sg115
+p209
+sg117
 I00
-sg116
-Nsa(dp214
+sg118
+Nsa(dp210
 S'submodules'
-p215
+p211
 I01
-sg60
-S'102'
-p216
 sg62
+S'102'
+p212
+sg64
 I00
-sg63
+sg65
 I00
-sg64
-Nsg65
-g66
-sg67
-g68
-sg140
-g141
-sg75
-Nsg76
-g77
+sg66
+Nsg67
+I00
+sg68
+g69
+sg70
+g71
+sg141
+g142
 sg78
-g19
-sg79
-S'0.6.0'
-p217
+Nsg79
+g80
 sg81
 g19
-sS'rm'
-p218
-(lp219
+sg82
+S'0.6.0'
+p213
+sg84
+NsS'rm'
+p214
+(lp215
 S'libs/*.jar'
-p220
-asg85
-I00
-sg86
-Nsg127
-I00
-sg88
+p216
+asg88
 g89
 sg90
-g91
+g19
+sg91
+g19
+sg129
+I00
 sg93
+g94
+sg95
+g96
+sg98
 I00
 sg162
 I00
-sg96
-g19
-sg97
-g98
-sg99
-g100
-sg101
-g102
-sg103
-Nsg104
-g105
 sS'commit'
-p221
+p217
 S'v0.6.0'
-p222
-sg108
-(lp223
+p218
+sg103
+g104
+sg105
+g106
+sg107
+g108
+sg109
+Nsg110
+g111
 sS'gradle'
-p224
-(lp225
-g112
+p219
+(lp220
+g114
 asS'prebuild'
-p226
+p221
 S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build'
-p227
-sg115
+p222
+sg117
 I00
-sg116
+sg118
 NsasS'FlattrID'
-p228
+p223
 NsS'metadatapath'
-p229
+p224
 S'metadata/org.smssecure.smssecure.txt'
-p230
+p225
 sS'Disabled'
-p231
+p226
 NsS'Update Check Name'
-p232
+p227
 NsS'Vercode Operation'
-p233
-NsS'Current Version'
-p234
-S'0.6.0'
-p235
-s.
\ No newline at end of file
+p228
+Ns.
\ No newline at end of file
diff --git a/tests/metadata/org.videolan.vlc.pickle b/tests/metadata/org.videolan.vlc.pickle
index bc508ba3..51b8ddf7 100644
--- a/tests/metadata/org.videolan.vlc.pickle
+++ b/tests/metadata/org.videolan.vlc.pickle
@@ -44,7 +44,7 @@ p22
 I00
 sS'comments'
 p23
-(lp24
+(dp24
 sS'Repo Type'
 p25
 S'git'
@@ -5620,4 +5620,4 @@ sS'Current Version'
 p1524
 S'1.2.6'
 p1525
-s.
\ No newline at end of file
+s.
-- 
2.30.2