Merge branch 'master' into 'master'

# Conflicts:
#   metadata/info.schnatterer.nusic.txt

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:base-20160706
+image: fdroid/ci:base-20161223
 
 before_script:
   - rm -rf fdroidserver
@@ -8,4 +8,13 @@ before_script:
 
 lint:
   script:
-    - fdroid lint -f
+    - export EXITVALUE=0
+    - fdroid lint -f || {
+          export EXITVALUE=1;
+          printf "\nThese files have lint issues:\n";
+          fdroid rewritemeta -l;
+          printf "\nThese are the formatting issues:\n";
+          fdroid rewritemeta;
+          git --no-pager diff --color=always;
+      }
+    - exit $EXITVALUE

README.md

@@ -13,8 +13,9 @@ use it directly from master:
 	git clone https://gitlab.com/fdroid/fdroidserver.git
 	export PATH="$PATH:$PWD/fdroidserver"
 
-Enter your fdroiddata clone:
+Clone fdroiddata (or your fork) and enter it:
 
+	git clone https://gitlab.com/fdroid/fdroiddata.git
 	cd fdroiddata
 
 An empty config file should work for most setups:

metadata/An.stop.txt

@@ -1,5 +1,5 @@
 Categories:Time
-License:GPLv2
+License:GPL-2.0
 Web Site:
 Source Code:https://github.com/jdmonin/anstop
 Issue Tracker:https://github.com/jdmonin/anstop/issues

metadata/SpeedoMeterApp.main.txt

@@ -1,7 +1,7 @@
 Categories:Navigation
 License:PublicDomain
-Web Site:
+Web Site:https://sourceforge.net/projects/androidspeedo
-Source Code:http://sourceforge.net/projects/androidspeedo
+Source Code:https://sourceforge.net/p/androidspeedo/code
 Issue Tracker:
 
 Auto Name:Speedo

metadata/a2dp.Vol.txt

@@ -1,5 +1,5 @@
 Categories:Multimedia
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/jroal/a2dpvolume/blob/HEAD/README.asciidoc
 Source Code:https://github.com/jroal/a2dpvolume
 Issue Tracker:https://github.com/jroal/a2dpvolume/issues
@@ -76,13 +76,51 @@ Build:2.11.13,126
     gradle=yes
 
 Build:2.12.4,130
+    disable=old failing build
     commit=faace8e5b53c5ca2f13a2c972971a4c4ce655f83
     subdir=app
     patch=gradle.patch
     gradle=yes
     prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
 
+Build:2.12.5,131
+    commit=9c31879ec4fa5c1062d19e5d9e6ec485bea6500f
+    subdir=app
+    patch=gradle.patch
+    gradle=yes
+    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+Build:2.12.7,133
+    commit=7747d7fe945e925befa5af403b99a34a446b49e8
+    subdir=app
+    patch=gradle.patch
+    gradle=yes
+    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+Build:2.12.8,134
+    commit=80f5f24ad100c23b4acd6d37870864d4edb7d70e
+    subdir=app
+    patch=gradle.patch
+    gradle=yes
+    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+Build:2.12.9,135
+    commit=a08e21f28e1f63f05158b03ca18751c497cbf71a
+    subdir=app
+    patch=gradle.patch
+    gradle=yes
+    prebuild=sed -i -e '/support-v4/s/21.0.3/23.2.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/24/g' build.gradle
+
+Build:2.12.9.1,136
+    disable=non-free, see https://github.com/jroal/a2dpvolume/issues/242
+    commit=8307a4e0a234898cf8e55810e3a29949352d22b1
+    subdir=app
+    patch=gradle.patch
+    gradle=yes
+    prebuild=sed -i -e '/buildToolsVersion/s/23.0.2/25.0.0/g' -e '/support-v4/s/21.0.3/25.0.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/25/g' build.gradle && \
+        sed -i -e '/<!-- ATTENTION:/,+4d' -e 's@</application>@</service></application>@g' src/main/AndroidManifest.xml 
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.12.4
+Current Version:2.12.9.1
-Current Version Code:130
+Current Version Code:136

metadata/aarddict.android.txt

@@ -1,5 +1,5 @@
 Categories:Reading
-License:GPLv3
+License:GPL-3.0
 Web Site:http://aarddict.org/android
 Source Code:https://github.com/aarddict/android
 Issue Tracker:https://github.com/aarddict/android/issues

metadata/acr.browser.barebones.txt

@@ -1,5 +1,5 @@
 Categories:Internet
-License:Apache2
+License:Apache-2.0
 Web Site:
 Source Code:https://github.com/anthonycr/Lightning-Browser
 Issue Tracker:https://github.com/anthonycr/Lightning-Browser/issues

metadata/acr.browser.lightning.txt

@@ -1,5 +1,5 @@
 Categories:Internet
-License:MPL2
+License:MPL-2.0
 Web Site:http://acrdevelopment.org
 Source Code:https://github.com/anthonycr/Lightning-Browser
 Issue Tracker:https://github.com/anthonycr/Lightning-Browser/issues
@@ -82,7 +82,28 @@ Build:4.3.3,88
     gradle=lightningPlus
     scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
 
+Build:4.4.0,89
+    commit=v4.4.0
+    subdir=app
+    submodules=yes
+    gradle=lightningPlus
+    scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
+
+Build:4.4.1,90
+    commit=v4.4.1
+    subdir=app
+    submodules=yes
+    gradle=lightningPlus
+    scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
+
+Build:4.4.2,91
+    commit=e4a46b66b188d120faf2fdf3bcaf76bfffd5f5f7
+    subdir=app
+    submodules=yes
+    gradle=lightningPlus
+    scanignore=external/netcipher/libnetcipher/external/pinning/res/raw/cacerts
+
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:4.3.3
+Current Version:4.4.1
-Current Version Code:88
+Current Version Code:90

metadata/akk.astro.droid.moonphase.txt

@@ -1,5 +1,5 @@
 Categories:Multimedia,Time
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/andviane/moon
 Issue Tracker:https://github.com/andviane/moon/issues

metadata/am.ed.exportcontacts.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPLv3
+License:GPL-3.0
 Web Site:http://ed.am/dev/android/export-contacts
 Source Code:http://bzr.ed.am/android/export-contacts
 Issue Tracker:http://dev.ed.am/export-contacts

metadata/am.ed.importcontacts.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPLv3
+License:GPL-3.0
 Web Site:http://ed.am/dev/android/import-contacts
 Source Code:http://bzr.ed.am/android/import-contacts
 Issue Tracker:http://dev.ed.am/import-contacts

metadata/andraus.bluetoothhidemu.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:Apache2
+License:Apache-2.0
 Web Site:
 Source Code:https://github.com/andraus/BluetoothHidEmu
 Issue Tracker:https://github.com/andraus/BluetoothHidEmu/issues

metadata/android.androidVNC.txt

@@ -1,8 +1,8 @@
 Categories:System
-License:GPLv2+
+License:GPL-2.0+
-Web Site:https://code.google.com/p/android-vnc-viewer
+Web Site:
-Source Code:https://code.google.com/p/android-vnc-viewer/source
+Source Code:https://github.com/antlersoft/android-vnc-viewer
-Issue Tracker:
+Issue Tracker:https://github.com/antlersoft/android-vnc-viewer/issues
 
 Auto Name:androidVNC
 Summary:VNC (remote desktop) viewer
@@ -10,14 +10,14 @@ Description:
 A VNC (Virtual Network Computing) client.
 .
 
-Repo Type:git-svn
+Repo Type:git
-Repo:https://android-vnc-viewer.googlecode.com/svn/branches/antlersoft
+Repo:https://github.com/antlersoft/android-vnc-viewer
 
 Build:0.5.0,13
     commit=197
     subdir=androidVNC
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:RepoManifest/antlersoft
 Current Version:0.5.0
 Current Version Code:13

metadata/android.game.prboom.txt

@@ -1,5 +1,5 @@
 Categories:Games
-License:GPLv3
+License:GPL-3.0
 Web Site:https://code.google.com/p/prboom4android
 Source Code:https://code.google.com/p/prboom4android/source
 Issue Tracker:

metadata/android.tether.txt

@@ -1,6 +1,6 @@
 Disabled:Prebuilts
 Categories:Connectivity
-License:GPLv3
+License:GPL-3.0
 Web Site:https://code.google.com/p/android-wifi-tether
 Source Code:https://code.google.com/p/android-wifi-tether/source
 Issue Tracker:

metadata/anupam.acrylic.txt

@@ -1,5 +1,5 @@
 Categories:Graphics
-License:GPLv3+
+License:GPL-3.0+
 Web Site:https://github.com/valerio-bozzolan/AcrylicPaint/blob/HEAD/README.md
 Source Code:https://github.com/valerio-bozzolan/AcrylicPaint
 Issue Tracker:https://github.com/valerio-bozzolan/AcrylicPaint/issues
@@ -40,7 +40,12 @@ Build:2.1.4,14
     gradle=yes
     prebuild=echo -e 'android { lintOptions { abortOnError false } }' >> build.gradle
 
+Build:2.2.0,15
+    commit=ffa88e06780133e80cefbe7e3d592773bba7ff77
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.1.4
+Current Version:2.2.0
-Current Version Code:14
+Current Version Code:15

metadata/app.android.com.materialfilemanager.txt

@@ -0,0 +1,32 @@
+Categories:System
+License:Apache-2.0
+Web Site:https://github.com/CosimoSguanci/Material-File-Manager/blob/HEAD/README.md
+Source Code:https://github.com/CosimoSguanci/Material-File-Manager
+Issue Tracker:https://github.com/CosimoSguanci/Material-File-Manager/issues
+
+Auto Name:Material File Manager
+Summary:Manage your local files
+Description:
+Simple file manager.
+.
+
+Repo Type:git
+Repo:https://github.com/CosimoSguanci/Material-File-Manager
+
+Build:1.5,4
+    disable=https://github.com/CosimoSguanci/Material-File-Manager/issues/3
+    commit=0a966006ce939725d8e7cc236fdaadaa26d8677d
+    subdir=app
+    gradle=yes
+    srclibs=CommonsIO@2.5
+    rm=app/libs/*
+    prebuild=sed -i -e '/compile files/d' -e '/play-services/d' -e '/dependencies/acompile "net.lingala.zip4j:zip4j:1.3.2"' build.gradle && \
+        pushd $$CommonsIO$$ && \
+        $$MVN3$$ package && \
+        popd && \
+        cp $$CommonsIO$$/target/commons-io-2.5.jar libs/
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.5
+Current Version Code:4

metadata/app.easytoken.txt

@@ -1,5 +1,5 @@
 Categories:Security
-License:GPLv2+
+License:GPL-2.0+
 Web Site:http://forum.xda-developers.com/android/apps-games/app-easy-token-source-securid-token-t2805507
 Source Code:https://github.com/cernekee/EasyToken
 Issue Tracker:https://github.com/cernekee/EasyToken/issues

metadata/app.openconnect.txt

@@ -1,5 +1,5 @@
 Categories:Internet
-License:GPLv2+
+License:GPL-2.0+
 Web Site:http://forum.xda-developers.com/showthread.php?t=2616121
 Source Code:https://github.com/cernekee/ics-openconnect
 Issue Tracker:https://github.com/cernekee/ics-openconnect/issues

metadata/app.varlorg.unote.txt

@@ -1,5 +1,5 @@
 Categories:Writing
-License:GPLv3
+License:GPL-3.0
 Web Site:https://gitlab.com/Varlorg/uNote
 Source Code:https://gitlab.com/Varlorg/uNote/tree/HEAD
 Issue Tracker:https://gitlab.com/Varlorg/uNote/issues

metadata/apps.babycaretimer.txt

@@ -1,5 +1,5 @@
 Categories:Time
-License:GPLv3
+License:GPL-3.0
 Web Site:https://code.google.com/p/baby-care-timer
 Source Code:https://code.google.com/p/baby-care-timer/source
 Issue Tracker:

metadata/apps.droidnotify.txt

@@ -1,6 +1,6 @@
 AntiFeatures:NonFreeAdd
 Categories:System
-License:GPLv3
+License:GPL-3.0
 Web Site:https://code.google.com/p/droid-notify
 Source Code:https://code.google.com/p/droid-notify/source
 Issue Tracker:

metadata/aq.com.sharetobrowser.txt

@@ -0,0 +1,24 @@
+Categories:System,Internet
+License:MIT
+Web Site:
+Source Code:https://github.com/queler/sharetobrowser
+Issue Tracker:https://github.com/queler/sharetobrowser/issues
+
+Auto Name:ShareToBrowser
+Summary:View in different browser via the share function
+Description:
+v1.0 Hopefull this is simple and all that needs to be done.
+.
+
+Repo Type:git
+Repo:https://github.com/queler/sharetobrowser
+
+Build:1.0,1
+    commit=v1.0
+    subdir=app
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0
+Current Version Code:1

metadata/ar.com.tristeslostrestigres.diasporanativewebapp.txt

@@ -1,5 +1,5 @@
 Categories:Internet
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/martinchodev/Diaspora-Native-WebApp/blob/HEAD/README.md
 Source Code:https://github.com/martinchodev/Diaspora-Native-WebApp
 Issue Tracker:https://github.com/martinchodev/Diaspora-Native-WebApp/issues
@@ -108,7 +108,8 @@ Build:1.8.3,23
     subdir=app
     gradle=yes
 
-Auto Update Mode:Version v%v
+Archive Policy:0 versions
-Update Check Mode:Tags
+Auto Update Mode:None
+Update Check Mode:None
 Current Version:1.8.3
 Current Version Code:23

metadata/ar.com.tristeslostrestigres.redpanal.txt

@@ -1,5 +1,5 @@
 Categories:Multimedia,Internet
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/martinchodev/RedPanal-Android-WebApp
 Issue Tracker:https://github.com/martinchodev/RedPanal-Android-WebApp/issues

metadata/ar.rulosoft.mimanganu.txt

@@ -351,7 +351,88 @@ Build:1.51,51
         sed -i -e '/rapid.decoder/g' build.gradle && \
         sed -i -e '/maven {/,+2d' ../build.gradle
 
+Build:1.52,52
+    commit=1.52
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e '/maven {/,+2d' ../build.gradle
+
+Build:1.53,53
+    commit=1.53
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
+Build:1.54,54
+    commit=1.54
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
+Build:1.55,55
+    commit=1.55
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
+Build:1.56,56
+    commit=1.56
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
+Build:1.57,57
+    commit=1.57
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
+Build:1.58,58
+    commit=1.58
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
+Build:1.60,60
+    commit=1.60
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
+Build:1.61,61
+    commit=1.61
+    subdir=app
+    gradle=yes
+    srclibs=RapidDecoder@0.2.7
+    prebuild=cp -fR $$RapidDecoder$$/library/src/main/java/rapid src/main/java/ && \
+        sed -i -e '/rapid.decoder/g' build.gradle && \
+        sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g' ../build.gradle
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.51
+Current Version:1.61
-Current Version Code:51
+Current Version Code:61

metadata/arity.calculator.txt

@@ -1,5 +1,5 @@
 Categories:Science & Education
-License:Apache2
+License:Apache-2.0
 Web Site:https://code.google.com/p/arity-calculator
 Source Code:https://code.google.com/p/arity-calculator/source
 Issue Tracker:

metadata/at.bitfire.cadroid.txt

@@ -1,5 +1,5 @@
 Categories:Internet
-License:GPLv3
+License:GPL-3.0
 Web Site:http://cadroid.bitfire.at/#donations
 Source Code:https://github.com/bitfireAT/cadroid
 Issue Tracker:https://github.com/bitfireAT/cadroid/issues

metadata/at.bitfire.davdroid.mirakel.txt

@@ -1,6 +1,6 @@
 Disabled:Wait for davdroid-mainline
 Categories:Internet
-License:GPLv3
+License:GPL-3.0
 Web Site:http://mirakel.azapps.de
 Source Code:https://github.com/MirakelX/davdroid
 Issue Tracker:https://mirakel.atlassian.net/issues

metadata/at.bitfire.davdroid.txt

@@ -1,5 +1,5 @@
 Categories:Internet
-License:GPLv3
+License:GPL-3.0
 Web Site:https://davdroid.bitfire.at/
 Source Code:https://davdroid.bitfire.at/source/
 Issue Tracker:https://davdroid.bitfire.at/forums/
@@ -9,14 +9,14 @@ FlattrID:2100160
 Bitcoin:1KSCy7RHztKuhW9fLLaUYqdwdC2iwbejZU
 
 Auto Name:DAVdroid
-Summary:Contacts and Calendar sync
+Summary:Sync contacts and calendars
 Description:
 DAVdroid is a CalDAV/CardDAV synchronisation adapter for Android 4+ devices.
 
-Use it with your own server (like [https://owncloud.org/ OwnCloud],
+Use it with your own server (like [https://owncloud.org/ ownCloud]/
-[http://baikal-server.com/ Baïkal], [http://www.davical.org/ DAViCal] or
+[https://nextcloud.com/ Nextcloud], [http://baikal-server.com/ Baïkal],
-[http://radicale.org/ radiCALe]) or with a trusted hoster to keep your contacts
+[http://www.davical.org/ DAViCal] or [http://radicale.org/ radiCALe]) or with a
-and events under your control.
+trusted hoster to keep your contacts and events under your control.
 
 Integrates natively in Android calendar/contact apps. See homepage for
 configuration details, including info about self-signed certificates.
@@ -401,7 +401,132 @@ Build:1.2,109
     submodules=yes
     gradle=standard
 
+Build:1.2.1-ose,110
+    commit=v1.2.1
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.2.2-ose,111
+    commit=v1.2.2
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.2.3-ose,112
+    commit=v1.2.3
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3-ose,114
+    commit=v1.3
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.1-ose,116
+    commit=v1.3.1
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.2.2-ose,120
+    commit=v1.3.2.2
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.3-ose,123
+    commit=v1.3.3-hopefullybuildsnow
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.3.1-ose,125
+    commit=v1.3.3.1
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.4-ose,127
+    commit=v1.3.4
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.4.1-ose,128
+    commit=v1.3.4.1
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.5-ose,130
+    commit=v1.3.5
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.6-ose,131
+    commit=v1.3.6
+    subdir=app
+    submodules=yes
+    gradle=standard
+
+Build:1.3.7-ose,132
+    commit=v1.3.7.1-ose
+    subdir=app
+    submodules=yes
+    gradle=standard
+    prebuild=sed -i -e '/classpath/s/2\.\+/2.2.0/g' ../build.gradle
+
+Build:1.3.8-ose,134
+    commit=v1.3.8-ose
+    subdir=app
+    submodules=yes
+    gradle=standard
+    prebuild=sed -i -e '/distributionUrl/s/3.3/3.2.1/' ../gradle/wrapper/gradle-wrapper.properties && \
+        sed -i -e '/classpath/s/2\.\+/2.2.0/g' ../build.gradle
+
+Build:1.4.0-ose,135
+    commit=v1.4.0-ose
+    subdir=app
+    submodules=yes
+    gradle=standard
+    prebuild=sed -i -e '/distributionUrl/s/3.3/3.2.1/' ../gradle/wrapper/gradle-wrapper.properties && \
+        sed -i -e '/classpath/s/2\.\+/2.2.0/g' ../build.gradle
+
+Build:1.4.0.1-ose,136
+    commit=v1.4.0.1-ose
+    subdir=app
+    submodules=yes
+    gradle=standard
+    prebuild=sed -i -e '/distributionUrl/s/3.3/3.2.1/' ../gradle/wrapper/gradle-wrapper.properties && \
+        sed -i -e '/classpath/s/2\.\+/2.2.0/g' ../build.gradle
+
+Build:1.4.0.2-ose,137
+    commit=v1.4.0.2-ose
+    subdir=app
+    submodules=yes
+    gradle=standard
+    prebuild=sed -i -e '/distributionUrl/s/3.3/3.2.1/' ../gradle/wrapper/gradle-wrapper.properties && \
+        sed -i -e '/classpath/s/2\.\+/2.2.0/g' ../build.gradle
+
+Build:1.4.0.3-ose,138
+    commit=v1.4.0.3-ose
+    subdir=app
+    submodules=yes
+    gradle=standard
+    prebuild=sed -i -e '/distributionUrl/s/3.3/3.2.1/' ../gradle/wrapper/gradle-wrapper.properties && \
+        sed -i -e '/classpath/s/2\.\+/2.2.0/g' ../build.gradle
+
+Build:1.4.1-ose,139
+    commit=v1.4.1-ose
+    subdir=app
+    submodules=yes
+    gradle=standard
+
 Auto Update Mode:Version v%v
-Update Check Mode:Tags ^v[0-9.]*$
+Update Check Mode:Tags ^v[0-9.]+-ose$
-Current Version:1.2
+Current Version:1.4.1-ose
-Current Version Code:109
+Current Version Code:139

metadata/at.bitfire.icsdroid.txt

@@ -1,5 +1,5 @@
 Categories:Time
-License:GPLv3
+License:GPL-3.0
 Web Site:https://icsdroid.bitfire.at/
 Source Code:https://icsdroid.bitfire.at/source/
 Issue Tracker:https://icsdroid.bitfire.at/forums/

metadata/at.bitfire.nophonespam.txt

@@ -0,0 +1,37 @@
+Categories:Phone & SMS
+License:GPL-3.0
+Web Site:
+Source Code:https://gitlab.com/bitfireAT/NoPhoneSpam/
+Issue Tracker:
+Changelog:https://gitlab.com/bitfireAT/NoPhoneSpam/tags
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=ZT8F5NRCBDB2C&lc=AT&item_name=NoPhoneSpam&no_shipping=1&currency_code=EUR
+Bitcoin:1KSCy7RHztKuhW9fLLaUYqdwdC2iwbejZU
+
+Auto Name:NoPhoneSpam
+Summary:Block unwanted calls
+Description:
+Block calls from annoying or private numbers on your Android device.
+.
+
+Repo Type:git
+Repo:https://gitlab.com/bitfireAT/NoPhoneSpam.git
+
+Build:0.1,1
+    commit=v0.1
+    subdir=app
+    gradle=yes
+
+Build:0.2,2
+    commit=v0.2
+    subdir=app
+    gradle=yes
+
+Build:0.2.1,3
+    commit=v0.2.1
+    subdir=app
+    gradle=yes
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags ^v[0-9.]*$
+Current Version:0.2.1
+Current Version Code:3

metadata/at.dasz.KolabDroid.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPLv3
+License:GPL-3.0
 Web Site:https://code.google.com/p/kolab-android
 Source Code:https://gitorious.org/kolab-android/kolab-android
 Issue Tracker:

metadata/at.fhhgb.mc.swip.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPLv3+
+License:GPL-3.0+
 Web Site:https://bitbucket.org/FlorianSchrofner/swip
 Source Code:https://bitbucket.org/FlorianSchrofner/swip/src
 Issue Tracker:https://bitbucket.org/FlorianSchrofner/swip/issues

metadata/at.linuxtage.companion.txt

@@ -1,5 +1,5 @@
-Categories:Science & Education,Time
+Categories:Time
-License:Apache2
+License:Apache-2.0
 Web Site:
 Source Code:https://github.com/linuxtage/glt-companion
 Issue Tracker:https://github.com/linuxtage/glt-companion/issues
@@ -59,7 +59,12 @@ Build:1.2.0,10
     subdir=app
     gradle=yes
 
+Build:1.3.8,700138
+    commit=v1.3.8
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.2.0
+Current Version:1.3.8
-Current Version Code:10
+Current Version Code:700138

metadata/at.maui.cheapcast.txt

@@ -1,5 +1,5 @@
 Categories:Multimedia
-License:Apache2
+License:Apache-2.0
 Web Site:https://plus.google.com/communities/106486569778358341271
 Source Code:https://github.com/mauimauer/cheapcast
 Issue Tracker:https://github.com/mauimauer/cheapcast/issues

metadata/at.tomtasche.reader.txt

@@ -1,6 +1,6 @@
 AntiFeatures:Tracking,UpstreamNonFree
 Categories:Reading
-License:GPLv3+
+License:GPL-3.0+
 Web Site:http://reader.tomtasche.at
 Source Code:https://github.com/TomTasche/OpenDocument.droid
 Issue Tracker:https://github.com/TomTasche/OpenDocument.droid/issues

metadata/at.univie.sensorium.txt

@@ -1,5 +1,5 @@
 Categories:Science & Education
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/fmetzger/android-sensorium
 Issue Tracker:https://github.com/fmetzger/android-sensorium/issues

metadata/at.zweng.bankomatinfos.txt

@@ -1,5 +1,5 @@
 Categories:Money
-License:GPLv3
+License:GPL-3.0
 Web Site:http://johannes.zweng.at
 Source Code:https://github.com/johnzweng/bankomatinfos
 Issue Tracker:https://github.com/johnzweng/bankomatinfos/issues

metadata/at.zweng.bankomatinfos2.txt

@@ -1,5 +1,5 @@
 Categories:Money
-License:GPLv3
+License:GPL-3.0
 Web Site:http://johannes.zweng.at
 Source Code:https://github.com/johnzweng/bankomatinfos
 Issue Tracker:https://github.com/johnzweng/bankomatinfos/issues

metadata/atitel.com.todoer.txt

@@ -0,0 +1,26 @@
+Categories:Internet
+License:GPL-3.0
+Web Site:http://todoer.ir
+Source Code:https://github.com/adavari/Todoer
+Issue Tracker:https://github.com/adavari/Todoer/issues
+
+Auto Name:Todoer
+Summary:Simple todo list
+Description:
+A Todo list. Please note that this software was going to be used only for a
+month and is not written security / performance / beaty in mind! Hope this
+changes soon. At the moment this code can be seen in action at todoer.ir
+.
+
+Repo Type:git
+Repo:https://github.com/adavari/Todoer
+
+Build:1.0,1
+    commit=f800c5e03e21e0b564c44bbd4c15602ec305d807
+    subdir=app
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:1.0
+Current Version Code:1

metadata/atm.rocketguardian.txt

@@ -0,0 +1,28 @@
+Categories:Games
+License:GPL-3.0+
+Web Site:https://gitlab.com/atorresm/rocket-guardian
+Source Code:https://gitlab.com/atorresm/rocket-guardian/tree/HEAD
+Issue Tracker:https://gitlab.com/atorresm/rocket-guardian/issues
+Changelog:https://gitlab.com/atorresm/rocket-guardian/blob/HEAD/CHANGELOG
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M7YKJ3W9E9BVY
+
+Auto Name:Rocket Guardian
+Summary:Do your duty and destroy the zombies
+Description:
+Rocket Guardian is a game about a guardian that must protect a city from the
+falling zombies.
+.
+
+Repo Type:git
+Repo:https://gitlab.com/atorresm/rocket-guardian.git
+
+Build:1.0,1
+    commit=1.0
+    subdir=android
+    gradle=yes
+    scandelete=android/libs
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0
+Current Version Code:1

metadata/atm.starun.game.txt

@@ -0,0 +1,46 @@
+Categories:Games
+License:GPL-3.0
+Web Site:https://gitlab.com/atorresm/Starun
+Source Code:https://gitlab.com/atorresm/Starun/tree/HEAD
+Issue Tracker:https://gitlab.com/atorresm/Starun/issues
+Changelog:https://gitlab.com/atorresm/Starun/blob/HEAD/CHANGELOG
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M7YKJ3W9E9BVY
+
+Auto Name:Starun
+Summary:Follow a cute star's travel
+Description:
+Starun is a simple game about a cute, little star that must avoid asteroids in
+order to reach its destination.
+.
+
+Repo Type:git
+Repo:https://gitlab.com/atorresm/Starun.git
+
+Build:1.0,1
+    commit=4d68411e4877f296a466bbef198843bf6a78d9b2
+    subdir=android
+    gradle=yes
+    scandelete=android/libs
+
+Build:1.01,101
+    commit=1.01
+    subdir=android
+    gradle=yes
+    scandelete=android/libs
+
+Build:1.2,120
+    commit=1.2
+    subdir=android
+    gradle=yes
+    scandelete=android/libs
+
+Build:1.2.1,121
+    commit=1.2.1
+    subdir=android
+    gradle=yes
+    scandelete=android/libs
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:1.2.1
+Current Version Code:121

metadata/au.com.wallaceit.reddinator.txt

@@ -1,5 +1,5 @@
 Categories:Internet
-License:GPLv3+
+License:GPL-3.0+
 Web Site:
 Source Code:https://github.com/micwallace/reddinator
 Issue Tracker:https://github.com/micwallace/reddinator/issues
@@ -208,7 +208,96 @@ Build:3.13,45
     forceversion=yes
     rm=build.gradle,build
 
+Build:3.16,50
+    commit=3.16
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+
+Build:3.17,52
+    commit=3.17
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+
+Build:3.18,53
+    disable=gradle issue
+    commit=3.18
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+
+Build:3.20,55
+    disable=wrong vercode
+    commit=3.20
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+    prebuild=sed -i -e '/classpath/s/2.2.1/2.1.3/g' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle
+
+Build:3.20,57
+    commit=3.20
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+    prebuild=sed -i -e '/classpath/s/2.2.1/2.1.3/g' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle
+
+Build:3.20.1,58
+    commit=3.20.1
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+    prebuild=sed -i -e '/classpath/s/2.2.1/2.1.3/g' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle
+
+Build:3.20.2,59
+    commit=3.20.2
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+    prebuild=sed -i -e '/mavenCentral/ajcenter()' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle
+
+Build:3.21.0,60
+    commit=3.21.0
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+    prebuild=sed -i -e '/mavenCentral/ajcenter()' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle
+
+Build:3.21.1,61
+    commit=3.21.1
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+    prebuild=sed -i -e '/mavenCentral/ajcenter()' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle
+
+Build:3.21.2,62
+    commit=3.21.2
+    subdir=reddinator
+    init=sed -i -e '/bintray/d' build.gradle
+    gradle=yes
+    forceversion=yes
+    rm=build.gradle
+    prebuild=sed -i -e '/mavenCentral/ajcenter()' -e 's#http://guardian.github.com/maven/repo-releases#https://jitpack.io#' -e "s/com.gu:option.*/com.github.guardian:Option:e933c3a31d'/" build.gradle
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:3.13
+Current Version:3.21.2
-Current Version Code:45
+Current Version Code:62

metadata/au.id.micolous.farebot.txt

@@ -0,0 +1,89 @@
+Categories:Navigation
+License:GPL-3.0+
+Web Site:https://micolous.github.io/metrodroid
+Source Code:https://github.com/micolous/metrodroid
+Issue Tracker:https://github.com/micolous/metrodroid/issues
+
+Auto Name:Metrodroid
+Summary:Metrodroid can read information from some public transport NFC smartcards
+Description:
+Metrodroid can read information from some public transport NFC smartcards. It
+was formerly known as Farebot M.
+
+This is a fork of Eric Butler's Farebot project, with support for additional
+cards and bug fixes.
+
+Supported cards:
+
+- Bilhete Único - São Paulo, Brazil (1) (2) (5)
+
+- Clipper - San Francisco, CA, USA
+
+- EZ-Link - Singapore (3)
+
+- Go card - Brisbane and South East Queensland, Australia (0) (1) (2)
+
+- Manly Fast Ferry - Sydney (and surrounds), NSW, Australia (0) (1) (2)
+
+- Matkakortti, HSL - Finland
+
+- Myki - Melbourne (and surrounds), VIC, Australia (0) (4)
+
+- MyWay - Australian Capital Territory, Australia (0) (1) (2) (5)
+
+- NETS Flashpay - Singapore
+
+- Octopus - Hong Kong (0)
+
+- Opal - Sydney, NSW, Australia (0)
+
+- ORCA - Seattle, WA, USA
+
+- OV-chipkaart - Netherlands (1) (2)
+
+- Shenzhen Tong - Shenzong, Guangdong Province, China (0)
+
+- Suica, IOCOA, PASMO, Edy - Japan
+
+- Transit Access Pass - Los Angeles, CA, USA (0) (1) (2)
+
+(0): New in Metrodroid.
+
+(1): Not compatible with all devices (Mifare Classic).
+
+(2): Encryption keys are required to read this card.
+
+(3): Not compatible with all devices (CEPAS).
+
+(4): Only the card number can be read.
+
+(5): Fallback reader -- must be explicitly enabled in the application's
+preferences.
+
+You require a NFC-compatible phone in order to read cards.
+
+You need a NXP NFC chipset in your phone in order to read MIFARE Classic cards.
+Some phones have NFC chips from other manufacturers, which do not read Mifare
+Classic cards (eg: Nexus 4, Nexus 5, Samsung Galaxy S4). Check the About screen
+in the app in order to determine if your phone supports MIFARE Classic.
+
+Some agencies have encrypted cards. You will need to acquire encryption keys in
+order to read them. These are generally unique to each card. Sorry, I can't help
+you with this.
+
+Some other agencies' cards using Cubic Nextfare on Mifare Classic may also work.
+.
+
+Repo Type:git
+Repo:https://github.com/micolous/metrodroid
+
+Build:v2.9.30-fdroid,30
+    commit=v2.9.30
+    submodules=yes
+    gradle=yes
+    forceversion=yes
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:2.9.30
+Current Version Code:30

metadata/aws.apps.androidDrawables.txt

@@ -1,5 +1,5 @@
 Categories:Development
-License:Apache2
+License:Apache-2.0
 Web Site:http://aschillings.co.uk/html/android_resource_viewer.html
 Source Code:https://github.com/alt236/Android-Drawables---Android
 Issue Tracker:https://github.com/alt236/Android-Drawables---Android/issues

metadata/aws.apps.usbDeviceEnumerator.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:Apache2
+License:Apache-2.0
 Web Site:http://aschillings.co.uk/html/usb_device_info.html
 Source Code:https://github.com/alt236/USB-Device-Info---Android
 Issue Tracker:https://github.com/alt236/USB-Device-Info---Android/issues
@@ -16,7 +16,12 @@ Repo:https://github.com/alt236/USB-Device-Info---Android.git
 Build:0.0.5,5
     commit=v0.0.5
 
+Build:1.0.0,6
+    commit=v1.0.0
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.0.5
+Current Version:v1.0.0
-Current Version Code:5
+Current Version Code:6

metadata/bander.notepad.txt

@@ -1,5 +1,5 @@
 Categories:Writing
-License:Apache2
+License:Apache-2.0
 Web Site:https://code.google.com/p/banderlabs
 Source Code:https://code.google.com/p/banderlabs/source
 Issue Tracker:

metadata/be.ac.ulb.lisa.idot.android.dicomviewer.txt

@@ -1,5 +1,5 @@
 Categories:Sports & Health
-License:GPLv3+
+License:GPL-3.0+
 Web Site:https://code.google.com/p/droid-dicom-viewer
 Source Code:https://code.google.com/p/droid-dicom-viewer/source
 Issue Tracker:

metadata/be.brunoparmentier.apkshare.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPLv3+
+License:GPL-3.0+
 Web Site:
 Source Code:https://github.com/bparmentier/APKShare
 Issue Tracker:https://github.com/bparmentier/APKShare/issues

metadata/be.brunoparmentier.dnssetter.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:GPLv3+
+License:GPL-3.0+
 Web Site:
 Source Code:https://github.com/bparmentier/DNSSetter
 Issue Tracker:https://github.com/bparmentier/DNSSetter/issues

metadata/be.brunoparmentier.openbikesharing.app.txt

@@ -1,5 +1,5 @@
 Categories:Navigation
-License:GPLv3+
+License:GPL-3.0+
 Web Site:http://openbikesharing.org
 Source Code:https://github.com/bparmentier/OpenBikeSharing
 Issue Tracker:https://github.com/bparmentier/OpenBikeSharing/issues

metadata/be.brunoparmentier.wifikeyshare.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:GPLv3+
+License:GPL-3.0+
 Web Site:http://wifikeysha.re
 Source Code:https://github.com/bparmentier/WiFiKeyShare
 Issue Tracker:https://github.com/bparmentier/WiFiKeyShare/issues

metadata/be.digitalia.fosdem.txt

@@ -1,5 +1,5 @@
 Categories:Time
-License:Apache2
+License:Apache-2.0
 Web Site:
 Source Code:https://github.com/cbeyls/fosdem-companion-android
 Issue Tracker:https://github.com/cbeyls/fosdem-companion-android/issues
@@ -74,7 +74,32 @@ Build:1.3.6,700136
     subdir=app
     gradle=yes
 
+Build:1.3.8,700138
+    commit=1.3.8
+    subdir=app
+    gradle=yes
+
+Build:1.4.0,700140
+    commit=1.4.0
+    subdir=app
+    gradle=yes
+
+Build:1.4.2,700142
+    commit=1.4.2
+    subdir=app
+    gradle=yes
+
+Build:1.4.3,700143
+    commit=1.4.3
+    subdir=app
+    gradle=yes
+
+Build:1.4.4,700144
+    commit=1.4.4
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.3.6
+Current Version:1.4.4
-Current Version Code:700136
+Current Version Code:700144

metadata/be.geecko.QuickLyric.txt

@@ -1,5 +1,5 @@
 Categories:Multimedia
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/geecko86/QuickLyric/blob/HEAD/README.md
 Source Code:https://github.com/geecko86/QuickLyric
 Issue Tracker:https://github.com/geecko86/QuickLyric/issues

metadata/be.norio.randomapp.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/litrik/be.norio.randomapp
 Issue Tracker:https://github.com/litrik/be.norio.randomapp/issues

metadata/be.ppareit.shutdown.txt

@@ -1,5 +1,5 @@
 Categories:Theming
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/ppareit/Shutdown
 Issue Tracker:https://github.com/ppareit/Shutdown/issues

metadata/be.ppareit.swiftp_free.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:GPLv3
+License:GPL-3.0
 Web Site:https://ppareit.github.com/swiftp
 Source Code:https://github.com/ppareit/swiftp
 Issue Tracker:https://github.com/ppareit/swiftp/issues
@@ -93,14 +93,37 @@ Build:2.12.0,21200
     gradle=fdroid_free
     prebuild=sed -i -e '/shrinkResources/d' -e '/minifyEnabled/d' -e '/proguardFiles/d' build.gradle
 
+Build:2.13.0,21300
+    disable=twofortyfouram's sdk needs to be replaced
+    commit=v2.13
+    subdir=app
+    gradle=fdroid_free
+    prebuild=sed -i -e '/shrinkResources/d' -e '/minifyEnabled/d' -e '/proguardFiles/d' -e '/twofortyfouram/d' build.gradle
+
+Build:2.13.1,21301
+    commit=v2.13.1
+    subdir=app
+    gradle=fdroid_free
+    prebuild=sed -i -e '/dl.bintray.com/d' -e '/shrinkResources/d' -e '/minifyEnabled/d' -e '/proguardFiles/d' build.gradle
+
+Build:2.14.1,21401
+    commit=v2.14.1
+    subdir=app
+    gradle=fdroid_free
+    prebuild=sed -i -e '/dl.bintray.com/d' -e '/shrinkResources/d' -e '/minifyEnabled/d' -e '/proguardFiles/d' build.gradle
+
+Build:2.14.2,21402
+    commit=v2.14.2
+    subdir=app
+    gradle=fdroid_free
+    prebuild=sed -i -e '/dl.bintray.com/d' -e '/shrinkResources/d' -e '/minifyEnabled/d' -e '/proguardFiles/d' build.gradle
+
 Maintainer Notes:
 Remove shrink/minify stuff since the proguard config is missing.
-
-Enable AUM again if upstream starts tagging properly (see v2.12 vs 2.12.0).
 .
 
-Auto Update Mode:None
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Update Check Name:be.ppareit.swiftp
-Current Version:2.12.0
+Current Version:2.14.2
-Current Version Code:21200
+Current Version Code:21402

metadata/be.quentinloos.manille.txt

@@ -1,5 +1,5 @@
 Categories:Games
-License:GPLv3
+License:GPL-3.0
 Web Site:https://quentinloos.be/projets/manille
 Source Code:https://github.com/Kent1/Manille
 Issue Tracker:https://github.com/Kent1/Manille/issues

metadata/be.uhasselt.privacypolice.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:GPLv2+
+License:GPL-2.0+
 Web Site:https://github.com/BramBonne/privacypolice/blob/HEAD/README.md
 Source Code:https://github.com/BramBonne/privacypolice
 Issue Tracker:https://github.com/BramBonne/privacypolice/issues
@@ -57,7 +57,13 @@ Build:2.2.3,12
     subdir=privacypolice
     gradle=yes
 
+Build:2.2.4,13
+    commit=84bd3d579257dcd00cd66073546baa29e088be44
+    subdir=privacypolice
+    gradle=yes
+    prebuild=sed -i -e '/classpath/s/2.2.0/2.1.0/g' ../build.gradle
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.2.3
+Current Version:2.2.4
-Current Version Code:12
+Current Version Code:13

metadata/br.com.dgimenes.nasapic.txt

@@ -47,6 +47,17 @@ Build:3.1.1,11
         sed -i -e "1iapply plugin: 'com.android.application'\n\nandroid {\n\n" -e '/crashlytics/,+2d' build.gradle && \
         sed -i -e '/Crashlytics/d' -e '/import io.fabric.sdk.android.Fabric/d' src/main/java/br/com/dgimenes/nasapic/control/activity/MainActivity.java
 
+Build:3.2,12
+    commit=705d9d3ecfada951f803ef3363fcc19b1e51d99a
+    subdir=app
+    init=sed -i "s/\(buildscript {\)/\1\n  System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'/" ../build.gradle && \
+        sed -i 's/buildToolsVersion "23.0.0"/buildToolsVersion "23.0.3"/' build.gradle
+    gradle=yes
+    prebuild=sed -i -e '1,/android {/d' build.gradle && \
+        sed -i -e "1iapply plugin: 'com.android.application'\n\nandroid {\n\n" -e '/crashlytics/,+2d' build.gradle && \
+        sed -i -e '/Crashlytics/d' -e '/import io.fabric.sdk.android.Fabric/d' src/main/java/br/com/dgimenes/nasapic/control/activity/MainActivity.java && \
+        sed -i -e '/rashlytics/d' -e '/Answers\.getInstance()/d' -e '/import io.fabric.sdk.android.Fabric/d' src/main/java/br/com/dgimenes/nasapic/service/EventsLogger.java
+
 Maintainer Notes:
 2.5 doesn't work, so keep in archive until we can build a version that currently works.
 .

metadata/br.com.frs.foodrestrictions.txt

@@ -0,0 +1,49 @@
+Categories:Sports & Health
+License:GPL-3.0
+Web Site:https://github.com/trmendes/FoodRestrictions/blob/HEAD/README.md
+Source Code:https://github.com/trmendes/FoodRestrictions
+Issue Tracker:https://github.com/trmendes/FoodRestrictions/issues
+
+Auto Name:Food Restrictions
+Summary:Place orders with food restrictions in multiple languages
+Description:
+When traveling abroad, are you having a hard time getting your food restrictions
+across?
+
+This app is here to help you ordering food when you are traveling to a country
+where language barriers can make it difficult to make yourself understood.
+
+The purpose of this app is to help you to show the waiter, food vendor, etc.
+what kind of food you don't eat or can't eat even if the they don't speak
+English or your language.
+
+The best of all: you don't have to go through the trouble of drawing pictures or
+using ‘sign language’. All you have to do is configure your app to the language
+of the area you are visiting.
+
+This app has some Vegetarian and Vegan phrases in a few languages. All you need
+to do is select the desired language in your app and you will instantly be able
+to show people your culinary wishes using the menu on the left and choosing the
+language the other person speaks.
+
+If the person who is cooking something for you can't read there is also an
+option where you can select some icons to show what you don't eat or can't eat.
+
+Upstream developed this app to communicate his food preferences while traveling.
+He hopes it will be useful to you as well!
+
+Happy travels and Bon Appétit!.
+.
+
+Repo Type:git
+Repo:https://github.com/trmendes/FoodRestrictions
+
+Build:1.0,2
+    commit=ea9e95b1299676c115cce1a5410e8da684dd50c6
+    subdir=app
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:2

metadata/br.odb.knights.txt

@@ -0,0 +1,33 @@
+Categories:Games
+License:FreeBSD
+Web Site:https://github.com/TheFakeMontyOnTheRun/knightsofalentejo/blob/HEAD/README.md
+Source Code:https://github.com/TheFakeMontyOnTheRun/knightsofalentejo
+Issue Tracker:https://github.com/TheFakeMontyOnTheRun/knightsofalentejo/issues
+
+Auto Name:The Knights of Alentejo
+Summary:Guide knights through a dungeon
+Description:
+Explore the maze and defeat all demons in this cool turn-based strategy game!
+You control 3 Portuguese Knights exploring a dungeon, on a quest to defeat the
+master demon behind the invasion.
+
+Either purge the level from demons or run for the exit. Any killed knight will
+resurrect as you exit the level; Each Knight has it's own set of skills
+
+Compatible with USB Joysticks and a experimental Second Screen support, using
+HDMI, Miracast or Chromecast (using Cast Screen)
+.
+
+Repo Type:git
+Repo:https://github.com/TheFakeMontyOnTheRun/knightsofalentejo
+
+Build:2.1,5
+    commit=v21
+    subdir=KnightsOfAlentejoAndroid-AS/app
+    submodules=yes
+    gradle=all
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2.1
+Current Version Code:5

metadata/btools.routingapp.txt

@@ -1,5 +1,5 @@
 Categories:Navigation
-License:GPLv3
+License:GPL-3.0
 Web Site:http://brouter.de/brouter
 Source Code:https://github.com/abrensch/brouter
 Issue Tracker:https://github.com/abrensch/brouter/issues
@@ -60,7 +60,39 @@ Build:1.4.1,12
     prebuild=sed -i -e '79,81d' pom.xml && \
         sed -i -e '44,70d' pom.xml
 
+Build:1.4.3,14
+    disable=android api issues
+    commit=42e9ddbdd1cb05c1d31a9cd770a42183903525c6
+    subdir=brouter-routing-app
+    maven=yes@..
+    prebuild=sed -i -e '79,81d' pom.xml && \
+        sed -i -e '44,70d' pom.xml
+
+Build:1.4.6,17
+    disable=android api issues
+    commit=cf5e56054b04b921e9b37aeba1176c781737be3b
+    subdir=brouter-routing-app
+    maven=yes@..
+    prebuild=sed -i -e '79,81d' pom.xml && \
+        sed -i -e '44,70d' pom.xml
+
+Build:1.4.7,18
+    commit=d42895880d82373c5f98086c9ae2f9b5c4c77ae4
+    subdir=brouter-routing-app
+    maven=yes@..
+    prebuild=sed -i -e '79,81d' pom.xml && \
+        sed -i -e '44,70d' pom.xml && \
+        sed -i -e '/platform/s/10/14/g' pom.xml && \
+        sed -i -e '/targetSdkVersion/s/10/14/g' AndroidManifest.xml
+
+Build:1.4.8,19
+    commit=9d5ecb93ad262dd9af3cebcfceb6e2d6db7b1328
+    subdir=brouter-routing-app
+    maven=yes@..
+    prebuild=sed -i -e '79,81d' pom.xml && \
+        sed -i -e '44,70d' pom.xml
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.4.2
+Current Version:1.4.8
-Current Version Code:13
+Current Version Code:20

metadata/budo.budoist.txt

@@ -1,6 +1,6 @@
 AntiFeatures:NonFreeNet
 Categories:Time
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/budowski/budoist
 Issue Tracker:https://github.com/budowski/budoist/issues

metadata/buet.rafi.dictionary.txt

@@ -1,5 +1,5 @@
 Categories:Reading
-License:GPLv2
+License:GPL-2.0
 Web Site:
 Source Code:https://github.com/rafi-kamal/Bangla-Dictionary
 Issue Tracker:https://github.com/rafi-kamal/Bangla-Dictionary/issues

metadata/byrne.utilities.converter.txt

@@ -1,5 +1,5 @@
 Categories:Science & Education
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/dillbyrne/Bodha-Converter
 Issue Tracker:https://github.com/dillbyrne/Bodha-Converter/issues

metadata/byrne.utilities.hashpass.txt

@@ -1,5 +1,5 @@
 Categories:Security
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/dillbyrne/HashPass
 Issue Tracker:https://github.com/dillbyrne/HashPass/issues

metadata/byrne.utilities.pasteedroid.txt

@@ -1,6 +1,6 @@
 AntiFeatures:NonFreeNet
 Categories:Internet
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/dillbyrne/PasteeDroid
 Issue Tracker:https://github.com/dillbyrne/PasteeDroid/issues

metadata/ca.cmetcalfe.locationshare.txt

@@ -0,0 +1,51 @@
+Categories:Connectivity
+License:GPL-3.0
+Web Site:
+Source Code:https://github.com/pR0Ps/LocationShare
+Issue Tracker:https://github.com/pR0Ps/LocationShare/issues
+Changelog:https://github.com/pR0Ps/LocationShare/blob/HEAD/CHANGELOG.md
+Bitcoin:15jv7w1AdCMkNpDaAQrPtwK3Lfxx5ggAKX
+
+Auto Name:Location Share
+Summary:Share your current location
+Description:
+Location Share is a simple Android application that allows you to share your
+current location.
+
+Location Share doesn't require setting up an account, doesn't track your
+location in the background, doesn't auto-share it, and doesn't send it to anyone
+except those you explicitly tell it to.
+
+It can share your location using any application that supports sharing plain
+text. This includes (but isn't limited to) sharing via SMS, email, social
+networks, note taking applications, etc.
+
+Simply launch the application and wait until the device homes in on your
+location. You'll then have the option to view the location on a map, share it,
+or copy it to the clipboard.
+.
+
+Repo Type:git
+Repo:https://github.com/pR0Ps/LocationShare
+
+Build:1.0,1
+    commit=v1.0
+    subdir=app
+    gradle=yes
+
+Build:1.1,2
+    commit=v1.1
+    subdir=app
+    gradle=yes
+    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
+
+Build:1.2,3
+    commit=v1.2
+    subdir=app
+    gradle=yes
+    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:1.2
+Current Version Code:3

metadata/ca.cumulonimbus.barometernetwork.txt

@@ -1,6 +1,6 @@
 Disabled:Non-Free
 Categories:System
-License:GPLv3
+License:GPL-3.0
 Web Site:https://pressurenet.io
 Source Code:https://github.com/Cbsoftware/pressureNET
 Issue Tracker:https://github.com/Cbsoftware/pressureNET/issues

metadata/ca.ddaly.android.heart.txt

@@ -1,5 +1,5 @@
 Categories:Sports & Health
-License:GPLv3
+License:GPL-3.0
 Web Site:https://daryldy.github.com/Heart
 Source Code:https://github.com/daryldy/Heart
 Issue Tracker:https://github.com/daryldy/Heart/issues

metadata/ca.farrelltonsolar.classic.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:Apache2
+License:Apache-2.0
 Web Site:
 Source Code:https://github.com/graham22/Classic
 Issue Tracker:https://github.com/graham22/Classic/issues
@@ -90,7 +90,27 @@ Build:2.4.4,244
     subdir=app
     gradle=yes
 
+Build:2.4.5,245
+    commit=e6d65e0377864f075706ad69b19f9de93f69bd8b
+    subdir=app
+    gradle=yes
+
+Build:2.4.6,246
+    commit=55bd0689ecb2afdedbdd6eb5a6fb66c6b2e4f837
+    subdir=app
+    gradle=yes
+
+Build:2.4.7,247
+    commit=7990d879b1c39d4b0ea7f8e945ad7edd99b131d5
+    subdir=app
+    gradle=yes
+
+Build:2.5.0,250
+    commit=860dc316e3bf40d3796c31eca7c9cfd8f2be1cfc
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.4.4
+Current Version:2.5.0
-Current Version Code:244
+Current Version Code:250

metadata/ca.mimic.apphangar.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPLv3
+License:GPL-3.0
 Web Site:http://hangar.mimic.ca
 Source Code:https://github.com/corcoran/Hangar
 Issue Tracker:https://github.com/corcoran/Hangar/issues
@@ -61,7 +61,12 @@ Build:2.6,74
     subdir=Apphangar
     gradle=yes
 
+Build:2.7,75
+    commit=2.7
+    subdir=Apphangar
+    gradle=yes
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:2.6
+Current Version:2.7
-Current Version Code:74
+Current Version Code:75

metadata/ca.mudar.fairphone.peaceofmind.txt

@@ -1,5 +1,5 @@
 Categories:Phone & SMS
-License:Apache2
+License:Apache-2.0
 Web Site:http://fairphone.mudar.ca/
 Source Code:https://github.com/mudar/Fairphone
 Issue Tracker:https://github.com/mudar/Fairphone/issues

metadata/ca.rmen.android.frenchcalendar.txt

@@ -1,5 +1,5 @@
 Categories:Theming,Time
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/caarmen/FRCAndroidWidget/blob/HEAD/README.md
 Source Code:https://github.com/caarmen/FRCAndroidWidget
 Issue Tracker:https://github.com/caarmen/FRCAndroidWidget/issues
@@ -100,12 +100,69 @@ Build:1.9.2,192
     prebuild=sed -i -e '/includeWear/s/true/false/g' ../settings.gradle
     scanignore=wearable/build.gradle
 
+Build:1.9.3,193
+    commit=release-1.9.3
+    subdir=handheld
+    gradle=foss
+    prebuild=sed -i -e '/includeWear/s/true/false/g' ../settings.gradle
+    scanignore=wearable/build.gradle
+
+Build:1.9.4,194
+    commit=release-1.9.4
+    subdir=handheld
+    gradle=foss
+    prebuild=sed -i -e '/includeWear/s/true/false/g' ../settings.gradle
+    scanignore=wearable/build.gradle
+
+Build:1.9.6,196
+    commit=release-1.9.6
+    subdir=handheld
+    gradle=foss
+    prebuild=sed -i -e '/includeWear/s/true/false/g' ../settings.gradle
+    scanignore=wearable/build.gradle
+
+Build:1.12.1,1121
+    commit=release-1.12.1
+    subdir=handheld
+    gradle=foss
+    prebuild=sed -i -e '/includeWear/s/true/false/g' ../settings.gradle
+    scanignore=wearable/build.gradle
+
+Build:1.12.2,1122
+    commit=release-1.12.2
+    subdir=handheld
+    gradle=foss
+    prebuild=sed -i -e '/includeWear/s/true/false/g' ../settings.gradle
+    scanignore=wearable/build.gradle
+
+Build:1.13.0,1130
+    commit=release-1.13.0
+    subdir=handheld
+    gradle=foss
+    prebuild=sed -i -e '/includeWear/s/true/false/g' ../settings.gradle
+    scanignore=wearable/build.gradle
+
+Build:1.14.0,1140
+    commit=release-1.14.0
+    subdir=app
+    gradle=yes
+
+Build:1.15.0,1150
+    commit=release-1.15.0
+    subdir=app
+    gradle=yes
+
+Build:1.15.2,1152
+    commit=release-1.15.2
+    subdir=app
+    gradle=yes
+
 Maintainer Notes:
-Upstream checks flavor containing Foss name and enables/disables wear support. However,
+Prior to 1.14.0, upstream checked flavor containing Foss name and enabled/disabled wear support. However,
-when building with fdroid, we do a `gradle clean` and thus this check fails.
+when building with fdroid, we do a `gradle clean` and thus this check failed.
 .
 
 Auto Update Mode:Version release-%v
 Update Check Mode:Tags ^release-
-Current Version:1.9.2
+Current Version:1.15.2
-Current Version Code:192
+Current Version Code:1152

metadata/ca.rmen.android.networkmonitor.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:Apache2
+License:Apache-2.0
 Web Site:https://github.com/caarmen/network-monitor/blob/HEAD/README.md
 Source Code:https://github.com/caarmen/network-monitor
 Issue Tracker:https://github.com/caarmen/network-monitor/issues
@@ -145,7 +145,61 @@ Build:1.27.1,12701
     init=sed -i '/proprietaryCompile/d' build.gradle
     gradle=foss
 
+Build:1.28.1,12801
+    commit=netmon-1.28.1
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
+Build:1.28.2,12802
+    commit=netmon-1.28.2
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
+Build:1.28.3,12803
+    commit=netmon-1.28.3
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
+Build:1.28.4,12804
+    commit=netmon-1.28.4
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
+Build:1.28.5,12805
+    commit=netmon-1.28.5
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
+Build:1.28.6,12806
+    commit=netmon-1.28.6
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
+Build:1.28.9,12809
+    commit=netmon-1.28.9
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
+Build:1.28.10,12810
+    commit=netmon-1.28.10
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
+Build:1.29.0,12900
+    commit=netmon-1.29.0
+    subdir=networkmonitor
+    init=sed -i '/proprietaryCompile/d' build.gradle
+    gradle=foss
+
 Auto Update Mode:Version netmon-%v
 Update Check Mode:Tags ^netmon-
-Current Version:1.27.1
+Current Version:1.29.0
-Current Version Code:12701
+Current Version Code:12900

metadata/ca.rmen.android.poetassistant.txt

@@ -1,5 +1,5 @@
 Categories:Writing
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/caarmen/poet-assistant/blob/HEAD/README.md
 Source Code:https://github.com/caarmen/poet-assistant
 Issue Tracker:https://github.com/caarmen/poet-assistant/issues
@@ -114,7 +114,171 @@ Build:1.7.3,173
     subdir=app
     gradle=yes
 
+Build:1.8.1,181
+    commit=release-1.8.1
+    subdir=app
+    gradle=yes
+
+Build:1.8.2,182
+    commit=release-1.8.2
+    subdir=app
+    gradle=yes
+
+Build:1.8.3,183
+    commit=release-1.8.3
+    subdir=app
+    gradle=yes
+
+Build:1.9.0,190
+    commit=release-1.9.0
+    subdir=app
+    gradle=yes
+
+Build:1.9.1,191
+    commit=release-1.9.1
+    subdir=app
+    gradle=yes
+
+Build:1.9.2,192
+    commit=release-1.9.2
+    subdir=app
+    gradle=yes
+
+Build:1.9.3,193
+    commit=release-1.9.3
+    subdir=app
+    gradle=yes
+
+Build:1.9.5,195
+    commit=release-1.9.5
+    subdir=app
+    gradle=yes
+
+Build:1.9.6,196
+    commit=release-1.9.6
+    subdir=app
+    gradle=yes
+
+Build:1.10.0,1100
+    commit=release-1.10.0
+    subdir=app
+    gradle=yes
+
+Build:1.10.1,1101
+    commit=release-1.10.1
+    subdir=app
+    gradle=yes
+
+Build:1.10.2,1102
+    commit=release-1.10.2
+    subdir=app
+    gradle=yes
+
+Build:1.10.3,1103
+    commit=release-1.10.3
+    subdir=app
+    gradle=yes
+
+Build:1.10.4,1104
+    commit=release-1.10.4
+    subdir=app
+    gradle=yes
+
+Build:1.10.6,1106
+    commit=release-1.10.6
+    subdir=app
+    gradle=yes
+
+Build:1.10.7,1107
+    commit=release-1.10.7
+    subdir=app
+    gradle=yes
+
+Build:1.10.9,1109
+    commit=release-1.10.9
+    subdir=app
+    gradle=yes
+
+Build:1.10.10,11010
+    commit=release-1.10.10
+    subdir=app
+    gradle=yes
+
+Build:1.10.11,11011
+    commit=release-1.10.11
+    subdir=app
+    gradle=yes
+
+Build:1.11.0,11100
+    commit=release-1.11.0
+    subdir=app
+    gradle=yes
+
+Build:1.11.1,11101
+    commit=release-1.11.1
+    subdir=app
+    gradle=yes
+
+Build:1.11.2,11102
+    commit=release-1.11.2
+    subdir=app
+    gradle=yes
+
+Build:1.12.0,11200
+    disable=dao session issue
+    commit=release-1.12.0
+    subdir=app
+    gradle=yes
+
+Build:1.13.0,11300
+    disable=dao session issue
+    commit=release-1.13.0
+    subdir=app
+    gradle=yes
+
+Build:1.13.1,11301
+    disable=dao session issue
+    commit=release-1.13.1
+    subdir=app
+    gradle=yes
+
+Build:1.13.2,11302
+    disable=dao session issue
+    commit=release-1.13.2
+    subdir=app
+    gradle=yes
+
+Build:1.14.0,11400
+    commit=release-1.14.0
+    subdir=app
+    gradle=yes
+
+Build:1.15.0,11500
+    commit=release-1.15.0
+    subdir=app
+    gradle=yes
+
+Build:1.16.1,11601
+    commit=release-1.16.1
+    subdir=app
+    gradle=yes
+
+Build:1.17.0,11700
+    commit=release-1.17.0
+    subdir=app
+    gradle=yes
+
+Build:1.17.1,11701
+    commit=release-1.17.1
+    subdir=app
+    gradle=yes
+
+Build:1.18.0,11800
+    commit=release-1.18.0
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version release-%v
 Update Check Mode:Tags ^release-
-Current Version:1.7.3
+Current Version:1.18.0
-Current Version Code:173
+Current Version Code:11800

metadata/ca.rmen.android.scrumchatter.txt

@@ -1,5 +1,5 @@
 Categories:Time
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/caarmen/scrumchatter/blob/HEAD/README.md
 Source Code:https://github.com/caarmen/scrumchatter
 Issue Tracker:https://github.com/caarmen/scrumchatter/issues
@@ -80,7 +80,47 @@ Build:1.3.2,10302
     subdir=app
     gradle=yes
 
+Build:1.3.3,10303
+    commit=scrumchatter-1.3.3
+    subdir=app
+    gradle=yes
+
+Build:1.4.0,10400
+    commit=scrumchatter-1.4.0
+    subdir=app
+    gradle=yes
+
+Build:1.5.0,10500
+    commit=scrumchatter-1.5.0
+    subdir=app
+    gradle=yes
+
+Build:1.5.2,10502
+    commit=scrumchatter-1.5.2
+    subdir=app
+    gradle=yes
+
+Build:1.5.3,10503
+    commit=scrumchatter-1.5.3
+    subdir=app
+    gradle=yes
+
+Build:1.5.4,10504
+    commit=scrumchatter-1.5.4
+    subdir=app
+    gradle=yes
+
+Build:1.6.0,10600
+    commit=scrumchatter-1.6.0
+    subdir=app
+    gradle=yes
+
+Build:1.6.2,10602
+    commit=scrumchatter-1.6.2
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version scrumchatter-%v
 Update Check Mode:Tags ^scrumchatter.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*
-Current Version:1.3.2
+Current Version:1.6.2
-Current Version Code:10302
+Current Version Code:10602

metadata/ca.rmen.nounours.txt

@@ -1,5 +1,5 @@
 Categories:Games
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/caarmen/nounours-android/blob/HEAD/README.md
 Source Code:https://github.com/caarmen/nounours-android
 Issue Tracker:https://github.com/caarmen/nounours-android/issues
@@ -94,7 +94,29 @@ Build:3.4.0,340
     gradle=fullFoss
     scanignore=wear/build.gradle
 
+Build:3.4.3,343
+    commit=release-3.4.3
+    subdir=handheld
+    init=sed -i 's/=true/=false/' ../settings.gradle
+    gradle=fullFoss
+    scanignore=wear/build.gradle
+
+Build:3.4.4,344
+    commit=release-3.4.4
+    subdir=handheld
+    init=sed -i 's/=true/=false/' ../settings.gradle
+    gradle=fullFoss
+    scanignore=wear/build.gradle
+
+Build:3.4.5,345
+    commit=release-3.4.5
+    subdir=handheld
+    init=sed -i 's/=true/=false/' ../settings.gradle
+    gradle=fullFoss
+    scanignore=wear/build.gradle
+
 Auto Update Mode:Version release-%v
-Update Check Mode:Tags ^release-
+Update Check Mode:HTTP
-Current Version:3.4.0
+Update Check Data:https://raw.githubusercontent.com/caarmen/nounours-android/master/build.gradle|ext.versionCode=(.*)|.|ext.versionName="(.*)"
-Current Version Code:340
+Current Version:3.4.5
+Current Version Code:345

metadata/caldwell.ben.bites.txt

@@ -1,5 +1,5 @@
 Categories:Reading
-License:GPLv3
+License:GPL-3.0
 Web Site:https://code.google.com/p/bites-android
 Source Code:https://code.google.com/p/bites-android/source
 Issue Tracker:

metadata/caldwell.ben.trolly.txt

@@ -1,5 +1,5 @@
 Categories:Writing
-License:GPLv3
+License:GPL-3.0
 Web Site:https://sites.google.com/site/caldwellcode
 Source Code:https://code.google.com/p/trolly/source
 Issue Tracker:
@@ -26,6 +26,6 @@ It needs a file from OpenIntents, so let's get it from Subversion...
 .
 
 Auto Update Mode:None
-Update Check Mode:Tags
+Update Check Mode:Static
 Current Version:1.4
 Current Version Code:6

metadata/cat.jordihernandez.cinecat.txt

@@ -1,5 +1,5 @@
 Categories:Multimedia
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/jordhi/CineCat/blob/HEAD/README.md
 Source Code:https://github.com/jordhi/CineCat
 Issue Tracker:https://github.com/jordhi/CineCat/issues

metadata/cat.mvmike.minimalcalendarwidget.txt

@@ -0,0 +1,64 @@
+Categories:Theming,Time
+License:BSD-3
+Web Site:
+Source Code:https://github.com/mvmike/min-cal-widget
+Issue Tracker:https://github.com/mvmike/min-cal-widget/issues
+
+Auto Name:MinCal Widget
+Summary:Minimal month calendar widget
+Description:
+Calendar widget that shows the current month.
+
+* Default 3x2 (resizable)
+* Dark theme
+* Displays all events from your calendars
+* Pressing on header opens widget configuration
+* Pressing on any day cell opens calendar application
+.
+
+Repo Type:git
+Repo:https://github.com/mvmike/min-cal-widget
+Binaries:https://github.com/mvmike/min-cal-widget/releases/download/v%v/min-cal-widget.apk
+
+Build:0.0.1,1
+    commit=v0.0.1
+    subdir=min-cal-widget
+    gradle=yes
+
+Build:0.1.0,2
+    disable=cannot reproduce apk
+    commit=v0.1.0
+    subdir=min-cal-widget
+    gradle=yes
+
+Build:0.1.1,3
+    disable=cannot reproduce apk
+    commit=v0.1.1
+    subdir=min-cal-widget
+    gradle=yes
+
+Build:0.2.0,4
+    disable=cannot reproduce apk
+    commit=v0.2.0
+    subdir=min-cal-widget
+    gradle=yes
+
+Build:0.2.1,5
+    commit=v0.2.1
+    subdir=min-cal-widget
+    gradle=yes
+
+Build:0.2.2,6
+    commit=v0.2.2
+    subdir=min-cal-widget
+    gradle=yes
+
+Build:0.3.0,7
+    commit=v0.3.0
+    subdir=min-cal-widget
+    gradle=yes
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:0.3.0
+Current Version Code:7

metadata/cc.co.eurdev.urecorder.txt

@@ -1,5 +1,5 @@
 Categories:Multimedia
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://bitbucket.org/thomasebell/urecord
 Issue Tracker:

metadata/cgeo.geocaching.txt

@@ -1,7 +1,7 @@
 Disabled:Wait for g-free build
 AntiFeatures:UpstreamNonFree
 Categories:Navigation
-License:Apache2
+License:Apache-2.0
 Web Site:http://www.cgeo.org
 Source Code:https://github.com/cgeo/c-geo-opensource
 Issue Tracker:https://github.com/cgeo/c-geo-opensource/issues

metadata/ch.bailu.aat.txt

@@ -1,5 +1,5 @@
 Categories:Navigation,Sports & Health
-License:GPLv3+
+License:GPL-3.0+
 Web Site:http://bailu.ch/aat
 Source Code:https://github.com/bailuk/AAT
 Issue Tracker:https://github.com/bailuk/AAT/issues
@@ -8,7 +8,8 @@ Auto Name:AAT
 Summary:Track your activities
 Description:
 GPS-tracking application for tracking sportive activities, with emphasis on
-cycling. It uses osmdroid to display map tiles from the OpenStreetMap  project.
+cycling. It uses MapsForge to display map tiles and offline maps from the
+OpenStreetMap project.
 .
 
 Repo Type:git
@@ -38,7 +39,41 @@ Build:v1.0-beta,10
     commit=v1.0-beta
     target=android-21
 
-Auto Update Mode:None
+Build:v1.1-beta,11
+    commit=v1.1-beta
+    target=android-21
+
+Build:v1.2-beta,12
+    commit=v1.2-beta
+    subdir=app
+    gradle=yes
+
+Build:v1.3-beta,13
+    commit=v1.3.1-beta
+    subdir=app
+    gradle=yes
+
+Build:v1.4-beta,14
+    commit=v1.4-beta
+    subdir=app
+    gradle=yes
+
+Build:v1.5-beta,15
+    commit=v1.5-beta
+    subdir=app
+    gradle=yes
+
+Build:v1.6-beta,16
+    commit=v1.6-beta
+    subdir=app
+    gradle=yes
+
+Build:v1.7-beta,17
+    commit=v1.7-beta
+    subdir=app
+    gradle=yes
+
+Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:v1.0-beta
+Current Version:v1.7-beta
-Current Version Code:10
+Current Version Code:17

metadata/ch.blinkenlights.android.apnswitch.txt

@@ -1,5 +1,5 @@
 Categories:Connectivity
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/adrian-bl/APN-Switch
 Issue Tracker:https://github.com/adrian-bl/APN-Switch/issues

metadata/ch.blinkenlights.android.vanilla.txt

@@ -1,12 +1,12 @@
 Categories:Multimedia
-License:GPLv3
+License:GPL-3.0
-Web Site:
+Web Site:http://vanillamusic.io/
 Source Code:https://github.com/vanilla-music/vanilla
 Issue Tracker:https://github.com/vanilla-music/vanilla/issues
 Changelog:https://cdn.rawgit.com/vanilla-music/vanilla/HEAD/assets/about.html
 
 Auto Name:Vanilla Music
-Summary:Music player
+Summary:Listen to and manage songs
 Description:
 Music player with a simple interface similar to the stock music player. Supports
 browsing by folder, queueing, shake-to-skip and more. Supports the same audio
@@ -122,7 +122,34 @@ Build:1.0.40,10400
 Build:1.0.41,10410
     commit=1.0.41
 
+Build:1.0.42,10420
+    commit=1.0.42
+
+Build:1.0.43,10430
+    commit=1.0.43
+
+Build:1.0.44,10440
+    commit=1.0.44
+
+Build:1.0.45,10450
+    commit=1.0.45
+
+Build:1.0.46,10460
+    commit=1.0.46
+
+Build:1.0.47,10470
+    commit=1.0.47
+
+Build:1.0.48,10480
+    commit=1.0.48
+
+Build:1.0.49,10490
+    commit=1.0.49
+
+Build:1.0.50,10500
+    commit=1.0.50
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.0.41
+Current Version:1.0.50
-Current Version Code:10410
+Current Version Code:10500

metadata/ch.blinkenlights.android.vanillaplug.txt

@@ -1,6 +1,6 @@
 Categories:Multimedia
-License:GPLv3+
+License:GPL-3.0+
-Web Site:
+Web Site:http://vanillamusic.io/
 Source Code:https://github.com/vanilla-music/vanilla-headphone-detector
 Issue Tracker:https://github.com/vanilla-music/vanilla-headphone-detector/issues
 

metadata/ch.blinkenlights.battery.txt

@@ -1,5 +1,5 @@
 Categories:System
-License:GPLv2
+License:GPL-2.0
 Web Site:
 Source Code:https://github.com/adrian-bl/bl-battstatus-android
 Issue Tracker:https://github.com/adrian-bl/bl-battstatus-android/issues

metadata/ch.citux.td.txt

@@ -1,6 +1,6 @@
 AntiFeatures:NonFreeNet
 Categories:Multimedia,Internet
-License:GPLv3
+License:GPL-3.0
 Web Site:https://github.com/CiTuX/TD/blob/HEAD/README.md
 Source Code:https://github.com/CiTuX/TD
 Issue Tracker:https://github.com/CiTuX/TD/issues

metadata/ch.corten.aha.worldclock.txt

@@ -1,5 +1,5 @@
 Categories:Time
-License:GPLv3+
+License:GPL-3.0+
 Web Site:https://github.com/arminha/worldclockwidget/blob/HEAD/README.rst
 Source Code:https://github.com/arminha/worldclockwidget
 Issue Tracker:https://github.com/arminha/worldclockwidget/issues
@@ -76,7 +76,19 @@ Build:1.8.3,44
     gradle=yes
     prebuild=sed -i -e '/codequality/d' -e '/def buildSuffix/,+4d' build.gradle
 
+Build:1.8.4,45
+    commit=1.8.4
+    subdir=worldclockwidget
+    gradle=yes
+    prebuild=sed -i -e '/codequality/d' -e '/def buildSuffix/,+4d' build.gradle
+
+Build:1.8.5,46
+    commit=1.8.5
+    subdir=worldclockwidget
+    gradle=yes
+    prebuild=sed -i -e '/codequality/d' -e '/def buildSuffix/,+4d' build.gradle
+
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.8.3
+Current Version:1.8.5
-Current Version Code:44
+Current Version Code:46

metadata/ch.dissem.android.drupal.txt

@@ -1,5 +1,5 @@
 Categories:Internet,Writing
-License:GPLv2
+License:GPL-2.0
 Web Site:
 Source Code:https://github.com/Dissem/Drupal-Editor
 Issue Tracker:https://github.com/Dissem/Drupal-Editor/issues

metadata/ch.fixme.cowsay.txt

@@ -1,5 +1,5 @@
 Categories:Development
-License:GPLv3
+License:GPL-3.0
 Web Site:https://fixme.ch/wiki/Cowsay_for_Android
 Source Code:https://github.com/rorist/Cowsay-android
 Issue Tracker:https://github.com/rorist/Cowsay-android/issues

metadata/ch.fixme.status.txt

@@ -1,5 +1,5 @@
 Categories:Time
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/fixme-lausanne/MyHackerspace
 Issue Tracker:https://github.com/fixme-lausanne/MyHackerspace/issues

metadata/ch.hgdev.toposuite.txt

@@ -1,5 +1,5 @@
 Categories:Science & Education
-License:GPLv2
+License:GPL-2.0
 Web Site:http://toposuite.hgdev.ch
 Source Code:https://github.com/hgdev-ch/toposuite-android
 Issue Tracker:https://github.com/hgdev-ch/toposuite-android/issues
@@ -102,7 +102,12 @@ Build:1.1.0,68
     subdir=app
     gradle=yes
 
+Build:1.2.0,69
+    commit=v1.2.0
+    subdir=app
+    gradle=yes
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.1.0
+Current Version:1.2.0
-Current Version Code:68
+Current Version Code:69

metadata/ch.hsr.eyecam.txt

@@ -1,5 +1,5 @@
 Categories:Multimedia
-License:GPLv3
+License:GPL-3.0
 Web Site:
 Source Code:https://github.com/tom-and-jerry/eyeCam
 Issue Tracker:https://github.com/tom-and-jerry/eyeCam/issues

metadata/ch.ihdg.calendarcolor.txt

@@ -8,8 +8,8 @@ FlattrID:a562233c4739d5cce92e816f32fb44c1
 Auto Name:Calendar Color
 Summary:Change the calendar color
 Description:
-A simple open source app to change to color of a calendar in android 4+. Tested
+A simple app to change to color of a calendar in android 4+. Tested with
-with calendars provided by baikal.
+calendars provided by baikal.
 
 Issues:
 

metadata/ch.logixisland.anuto.txt

@@ -1,5 +1,5 @@
 Categories:Games
-License:GPLv2
+License:GPL-2.0
 Web Site:
 Source Code:https://github.com/reloZid/android-anuto
 Issue Tracker:https://github.com/reloZid/android-anuto/issues
@@ -24,7 +24,22 @@ Build:0.1-5,6
     subdir=app
     gradle=yes
 
-Auto Update Mode:None
+Build:0.2,7
-Update Check Mode:RepoManifest
+    commit=v0.2
-Current Version:0.1-5
+    subdir=app
-Current Version Code:6
+    gradle=yes
+
+Build:0.2-1,8
+    commit=v0.2-1
+    subdir=app
+    gradle=yes
+
+Build:0.2-2,9
+    commit=v0.2-2
+    subdir=app
+    gradle=yes
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:0.2-2
+Current Version Code:9