Remove Dogecoin donation support

Not nearly as popular as bitcoin and litecoin. To the point where it hadn't
been used yet.

Bump index version to 14 to mark its removal.

fdroidserver/metadata.py

@@ -68,7 +68,6 @@ app_defaults = OrderedDict([
     ('FlattrID', None),
     ('Bitcoin', None),
     ('Litecoin', None),
-    ('Dogecoin', None),
     ('Name', None),
     ('Auto Name', ''),
     ('Summary', ''),
@@ -200,11 +199,6 @@ valuetypes = {
                    ["Litecoin"],
                    []),
 
-    FieldValidator("Dogecoin address",
-                   r'^D[a-zA-Z0-9]{33}$', None,
-                   ["Dogecoin"],
-                   []),
-
     FieldValidator("bool",
                    r'([Yy]es|[Nn]o|[Tt]rue|[Ff]alse)', None,
                    ["Requires Root"],
@@ -1094,7 +1088,6 @@ def write_metadata(dest, app):
     writefield_nonempty('FlattrID')
     writefield_nonempty('Bitcoin')
     writefield_nonempty('Litecoin')
-    writefield_nonempty('Dogecoin')
     mf.write('\n')
     writefield_nonempty('Name')
     writefield_nonempty('Auto Name')

fdroidserver/update.py

@@ -99,7 +99,7 @@ def update_wiki(apps, sortedids, apks):
             requiresroot = 'Yes'
         else:
             requiresroot = 'No'
-        wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|changelog=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|dogecoin=%s|license=%s|root=%s}}\n' % (
+        wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|changelog=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|license=%s|root=%s}}\n' % (
             appid,
             app['Name'],
             time.strftime('%Y-%m-%d', app['added']) if 'added' in app else '',
@@ -112,7 +112,6 @@ def update_wiki(apps, sortedids, apks):
             app['FlattrID'],
             app['Bitcoin'],
             app['Litecoin'],
-            app['Dogecoin'],
             app['License'],
             requiresroot)
 
@@ -762,7 +761,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
         repoel.setAttribute("url", config['repo_url'])
         addElement('description', config['repo_description'], doc, repoel)
 
-    repoel.setAttribute("version", "13")
+    repoel.setAttribute("version", "14")
     repoel.setAttribute("timestamp", str(int(time.time())))
 
     nosigningkey = False
@@ -841,7 +840,6 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
         addElementNonEmpty('donate', app['Donate'], doc, apel)
         addElementNonEmpty('bitcoin', app['Bitcoin'], doc, apel)
         addElementNonEmpty('litecoin', app['Litecoin'], doc, apel)
-        addElementNonEmpty('dogecoin', app['Dogecoin'], doc, apel)
         addElementNonEmpty('flattr', app['FlattrID'], doc, apel)
 
         # These elements actually refer to the current version (i.e. which

tests/metadata/net.osmand.plus.pickle

@@ -113,78 +113,76 @@ sS'Summary'
 p55
 S'Offline/online maps and navigation'
 p56
-sS'Dogecoin'
+sS'Maintainer Notes'
 p57
-NsS'Maintainer Notes'
-p58
-(lp59
+(lp58
 S'No UCMs apply because git never contains actual releases, only pre-releses.'
-p60
+p59
 ag23
 aS'The build instructions have been moved to a script in the root of the repo,'
-p61
+p60
 aS"'build'. This way it can be updated along with the submodules."
-p62
+p61
 asS'Current Version Code'
-p63
+p62
 S'197'
-p64
+p63
 sS'Binaries'
-p65
+p64
 NsS'Archive Policy'
-p66
+p65
 NsS'builds'
-p67
-(lp68
-(dp69
+p66
+(lp67
+(dp68
 S'submodules'
-p70
+p69
 I01
 sS'vercode'
-p71
+p70
 S'182'
-p72
+p71
 sS'forceversion'
-p73
+p72
 I00
 sS'oldsdkloc'
-p74
+p73
 I00
 sS'gradleprops'
-p75
-(lp76
+p74
+(lp75
 sS'scanignore'
-p77
-(lp78
+p76
+(lp77
 sS'patch'
-p79
-(lp80
+p78
+(lp79
 sS'srclibs'
-p81
-(lp82
+p80
+(lp81
 sS'output'
-p83
+p82
 S'bin/OsmAnd-release-unsigned.apk'
-p84
+p83
 sS'encoding'
-p85
+p84
 NsS'extlibs'
-p86
-(lp87
+p85
+(lp86
 sS'init'
-p88
+p87
 g23
 sS'version'
-p89
+p88
 S'1.8.2'
-p90
+p89
 sS'build'
-p91
+p90
 S'./old-ndk-build.sh && ant -Dsdk.dir="$ANDROID_SDK" -Dndk.dir="$ANDROID_NDK" -DBLACKBERRY_BUILD=false -DBUILD_SUFFIX= -DAPK_NUMBER_VERSION=182 "-DFEATURES=+play_market +gps_status -parking_plugin -blackberry -amazon -route_nav" -DCLEAN_CPP=false -DPACKAGE_TO_BUILT=net.osmand.plus -DAPK_VERSION=1.8.2 -Dnet.osmand.plus= -Dbuild.version=1.8.2 -Dbuild.version.code=182 -Dnativeoff=false "-DversionFeatures=+play_market +gps_status -parking_plugin -blackberry -amazon -route_nav" clean release'
+p91
+sS'rm'
 p92
-sS'ndk_path'
-p93
-g23
+(lp93
 sS'kivy'
 p94
 I00
@@ -209,86 +207,86 @@ I00
 sS'disable'
 p104
 I00
-sS'rm'
+sS'ndk_path'
 p105
-(lp106
+g23
 sS'scandelete'
-p107
-(lp108
+p106
+(lp107
 sS'buildjni'
-p109
-(lp110
+p108
+(lp109
 S'no'
+p110
+asS'ndk'
 p111
-asS'ndk'
-p112
 S'r10e'
-p113
+p112
 sS'target'
-p114
+p113
 NsS'type'
-p115
+p114
 S'raw'
-p116
+p115
 sS'antcommands'
-p117
+p116
 NsS'gradle'
+p117
+I00
+sS'prebuild'
 p118
-I00
-sS'prebuild'
-p119
 S'sed -i \'s/"OsmAnd+"/"OsmAnd~"/g\' build.xml'
-p120
+p119
 sS'novcheck'
-p121
+p120
 I00
 sS'commit'
-p122
+p121
 S'76ada6c8a08afe69acb755503373ac36328ef665'
-p123
-sa(dp124
+p122
+sa(dp123
 S'submodules'
-p125
+p124
 I01
-sg71
+sg70
 S'183'
-p126
+p125
+sg72
+I00
 sg73
 I00
 sg74
-I00
-sg75
-(lp127
-sg77
-g78
-sg79
-g80
-sg81
-g82
+(lp126
+sg76
+g77
+sg78
+g79
+sg80
+g81
 sS'output'
-p128
+p127
 S'bin/OsmAnd-release-unsigned.apk'
-p129
-sg85
-Nsg86
-g87
+p128
+sg84
+Nsg85
+g86
+sg87
+g23
 sg88
-g23
-sg89
 S'1.8.3'
-p130
+p129
 sS'subdir'
-p131
+p130
 S'android/OsmAnd'
-p132
-sg93
-g23
+p131
+sg92
+g93
 sg94
 I00
 sS'build'
-p133
+p132
 S'../../build'
-p134
+p133
 sg97
 I00
 sg98
@@ -300,74 +298,74 @@ I00
 sg104
 I00
 sg105
-g106
-sg107
-g108
+g23
+sg106
+g107
 sS'buildjni'
-p135
-(lp136
+p134
+(lp135
 S'no'
-p137
-asg112
-g113
-sg114
-Nsg115
-g116
-sg117
-Nsg118
+p136
+asg111
+g112
+sg113
+Nsg114
+g115
+sg116
+Nsg117
 I00
 sS'prebuild'
+p137
+g23
+sg120
+I00
+sS'commit'
 p138
-g23
-sg121
-I00
-sS'commit'
-p139
 S'1.8.3'
-p140
-sa(dp141
+p139
+sa(dp140
 S'submodules'
-p142
+p141
 I01
-sg71
+sg70
 S'196'
-p143
+p142
+sg72
+I00
 sg73
 I00
 sg74
-I00
-sg75
-(lp144
-sg77
-g78
-sg79
-g80
-sg81
-g82
+(lp143
+sg76
+g77
+sg78
+g79
+sg80
+g81
 sS'output'
+p144
+S'bin/OsmAnd-release-unsigned.apk'
 p145
-S'bin/OsmAnd-release-unsigned.apk'
-p146
-sg85
-Nsg86
-g87
+sg84
+Nsg85
+g86
+sg87
+g23
 sg88
-g23
-sg89
 S'1.9.4'
-p147
+p146
 sS'subdir'
-p148
+p147
 S'android/OsmAnd'
-p149
-sg93
-g23
+p148
+sg92
+g93
 sg94
 I00
 sS'build'
-p150
+p149
 S'../../build'
-p151
+p150
 sg97
 I00
 sg98
@@ -379,75 +377,75 @@ I00
 sg104
 I00
 sg105
-g106
-sg107
-g108
-sS'buildjni'
-p152
-(lp153
-S'no'
-p154
-asS'ndk'
-p155
-S'r10d'
-p156
-sg114
-Nsg115
-g116
-sg117
-Nsg118
-I00
-sg138
 g23
-sg121
+sg106
+g107
+sS'buildjni'
+p151
+(lp152
+S'no'
+p153
+asS'ndk'
+p154
+S'r10d'
+p155
+sg113
+Nsg114
+g115
+sg116
+Nsg117
+I00
+sg137
+g23
+sg120
 I00
 sS'commit'
-p157
+p156
 S'1.9.4'
-p158
-sa(dp159
+p157
+sa(dp158
 S'submodules'
-p160
+p159
 I01
-sg71
+sg70
 S'197'
-p161
+p160
+sg72
+I00
 sg73
 I00
 sg74
-I00
-sg75
-(lp162
-sg77
-g78
-sg79
-g80
-sg81
-g82
+(lp161
+sg76
+g77
+sg78
+g79
+sg80
+g81
 sS'output'
-p163
+p162
 S'bin/OsmAnd-release-unsigned.apk'
-p164
-sg85
-Nsg86
-g87
+p163
+sg84
+Nsg85
+g86
+sg87
+g23
 sg88
-g23
-sg89
 S'1.9.5'
-p165
+p164
 sS'subdir'
-p166
+p165
 S'android/OsmAnd'
-p167
-sg93
-g23
+p166
+sg92
+g93
 sg94
 I00
 sS'build'
-p168
+p167
 S'../../build'
-p169
+p168
 sg97
 I00
 sg98
@@ -459,46 +457,46 @@ I00
 sg104
 I00
 sg105
-g106
-sg107
-g108
-sS'buildjni'
-p170
-(lp171
-S'no'
-p172
-asS'ndk'
-p173
-S'r10d'
-p174
-sg114
-Nsg115
-g116
-sg117
-Nsg118
-I00
-sg138
 g23
-sg121
+sg106
+g107
+sS'buildjni'
+p169
+(lp170
+S'no'
+p171
+asS'ndk'
+p172
+S'r10d'
+p173
+sg113
+Nsg114
+g115
+sg116
+Nsg117
+I00
+sg137
+g23
+sg120
 I00
 sS'commit'
+p174
+S'1.9.5'
 p175
-S'1.9.5'
-p176
 sasS'FlattrID'
-p177
+p176
 NsS'metadatapath'
-p178
+p177
 S'metadata/net.osmand.plus.xml'
-p179
+p178
 sS'Disabled'
-p180
+p179
 NsS'Update Check Name'
-p181
+p180
 NsS'Vercode Operation'
-p182
+p181
 NsS'Current Version'
-p183
+p182
 S'1.9.5'
-p184
+p183
 s.