Merge branch 'yml_s' into 'master'

rewrite to yml: s* See merge request fdroid/fdroiddata!4519
2019-02-21 13:47:35 +00:00 · 2019-02-21 13:47:35 +00:00 · 8cbe3fd097
parent eb7744e8cf e175eb8f45
commit 8cbe3fd097
85 changed files with 2579 additions and 2303 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -17,7 +17,7 @@ lint:
           appid=`echo $f | sed -n -e 's,^metadata/\([^/][^/]*\)\.txt,\1,p'
                                   -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`;
           export CHANGED="$CHANGED $appid";
-           grep -q "^Repo *Type\W *git" $f && git -C build clone `sed -n "s,^Repo *:,,p" $f` $appid;
+           grep -q "^Repo *Type\W *git$" $f && git -C build clone `sed -n "s,^Repo *:,,p" $f` $appid;
        done;
        ./tools/audit-gradle.py $CHANGED;
      fi
--- a/metadata/saschpe.contactevents.txt
+++ b/metadata/saschpe.contactevents.txt
@ -1,86 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:https://sites.google.com/view/birthday-calendar/
-Source Code:https://github.com/saschpe/BirthdayCalendar
-Issue Tracker:https://github.com/saschpe/BirthdayCalendar/issues
-
-Auto Name:Birthday Calendar
-Summary:Creates birthday events from all other calendar's data
-Description:
-Get a birthday calendar for all your social networks right inside Google
-Calendar. Supports Facebook, LinkedIn, Xing, Skype and all other apps which sync
-contacts with your Android device. Enable reminder alarms and decide which
-contacts you want to see. You'll get notifications for all of them.
-
-Features:
-
-* Birthdays and anniversaries for all your contacts
-* Customizable reminders (same day, one day in advance, ...) and the calendar color
-* Hide the app icon after setting it up so that it doesn't get in your way
-* Tablet support
-
-Based on [[org.birthdayadapter]].
-.
-
-Repo Type:git
-Repo:https://github.com/saschpe/BirthdayCalendar
-
-Build:1.4.5,160145
-    disable=pre-release dependencies
-    commit=52655fe1affb53f0e6000720d2c552b9c410c6b7
-    subdir=mobile
-    gradle=yes
-
-Build:1.4.7,160147
-    commit=release/1.4.7
-    subdir=mobile
-    gradle=yes
-
-Build:1.5.2,160152
-    commit=release/1.5.2
-    subdir=mobile
-    gradle=yes
-    output=build/outputs/apk/release/*-release-unsigned.apk
-
-Build:1.6.0,160160
-    commit=release/1.6.0
-    subdir=mobile
-    gradle=yes
-    output=build/outputs/apk/release/*-release-unsigned.apk
-
-Build:1.6.2,160162
-    disable=requires Gradle 4.1-milestone-1
-    commit=release/1.6.2
-    subdir=mobile
-    gradle=yes
-    output=build/outputs/apk/release/*-release-unsigned.apk
-
-Build:1.7.3,160173
-    disable=missing ic_launcher due to git-lfs use
-    commit=release/1.7.3
-    subdir=mobile
-    gradle=yes
-    output=build/outputs/apk/release/*-release-unsigned.apk
-
-Build:1.7.5,160175
-    commit=release/1.7.5
-    subdir=mobile
-    gradle=yes
-    output=build/outputs/apk/release/*-release-unsigned.apk
-
-Build:1.8.10,160176
-    commit=release/1.8.10
-    subdir=mobile
-    gradle=yes
-    output=build/outputs/apk/release/*-release-unsigned.apk
-
-Build:1.7.7,160177
-    commit=release/1.7.7
-    subdir=mobile
-    gradle=yes
-    output=build/outputs/apk/release/*-release-unsigned.apk
-
-Auto Update Mode:Version release/%v
-Update Check Mode:Tags ^release
-Current Version:1.7.7
-Current Version Code:160177
--- a/metadata/saschpe.contactevents.yml
+++ b/metadata/saschpe.contactevents.yml
@ -0,0 +1,105 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: https://sites.google.com/view/birthday-calendar/
+SourceCode: https://github.com/saschpe/BirthdayCalendar
+IssueTracker: https://github.com/saschpe/BirthdayCalendar/issues
+
+AutoName: Birthday Calendar
+Summary: Creates birthday events from all other calendar's data
+Description: |-
+    Get a birthday calendar for all your social networks right inside Google
+    Calendar. Supports Facebook, LinkedIn, Xing, Skype and all other apps which sync
+    contacts with your Android device. Enable reminder alarms and decide which
+    contacts you want to see. You'll get notifications for all of them.
+
+    Features:
+
+    * Birthdays and anniversaries for all your contacts
+    * Customizable reminders (same day, one day in advance, ...) and the calendar color
+    * Hide the app icon after setting it up so that it doesn't get in your way
+    * Tablet support
+
+    Based on [[org.birthdayadapter]].
+
+RepoType: git
+Repo: https://github.com/saschpe/BirthdayCalendar
+
+Builds:
+  - versionName: 1.4.5
+    versionCode: 160145
+    disable: pre-release dependencies
+    commit: 52655fe1affb53f0e6000720d2c552b9c410c6b7
+    subdir: mobile
+    gradle:
+      - yes
+
+  - versionName: 1.4.7
+    versionCode: 160147
+    commit: release/1.4.7
+    subdir: mobile
+    gradle:
+      - yes
+
+  - versionName: 1.5.2
+    versionCode: 160152
+    commit: release/1.5.2
+    subdir: mobile
+    gradle:
+      - yes
+    output: build/outputs/apk/release/*-release-unsigned.apk
+
+  - versionName: 1.6.0
+    versionCode: 160160
+    commit: release/1.6.0
+    subdir: mobile
+    gradle:
+      - yes
+    output: build/outputs/apk/release/*-release-unsigned.apk
+
+  - versionName: 1.6.2
+    versionCode: 160162
+    disable: requires Gradle 4.1-milestone-1
+    commit: release/1.6.2
+    subdir: mobile
+    gradle:
+      - yes
+    output: build/outputs/apk/release/*-release-unsigned.apk
+
+  - versionName: 1.7.3
+    versionCode: 160173
+    disable: missing ic_launcher due to git-lfs use
+    commit: release/1.7.3
+    subdir: mobile
+    gradle:
+      - yes
+    output: build/outputs/apk/release/*-release-unsigned.apk
+
+  - versionName: 1.7.5
+    versionCode: 160175
+    commit: release/1.7.5
+    subdir: mobile
+    gradle:
+      - yes
+    output: build/outputs/apk/release/*-release-unsigned.apk
+
+  - versionName: 1.8.10
+    versionCode: 160176
+    commit: release/1.8.10
+    subdir: mobile
+    gradle:
+      - yes
+    output: build/outputs/apk/release/*-release-unsigned.apk
+
+  - versionName: 1.7.7
+    versionCode: 160177
+    commit: release/1.7.7
+    subdir: mobile
+    gradle:
+      - yes
+    output: build/outputs/apk/release/*-release-unsigned.apk
+
+AutoUpdateMode: Version release/%v
+UpdateCheckMode: Tags ^release
+CurrentVersion: 1.7.7
+CurrentVersionCode: 160177
--- a/metadata/saschpe.poker.txt
+++ b/metadata/saschpe.poker.txt
@ -1,36 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:https://play.google.com/store/apps/details?id=saschpe.poker
-Source Code:https://github.com/saschpe/PlanningPoker
-Issue Tracker:https://github.com/saschpe/PlanningPoker/issues
-
-Summary:Planning Poker for phone, tablet and wear devices
-Description:
-A technique for estimating development goals in software development.
-
-Features:
-
-* Fibonacci, T-Shirt Size and Ideal Days card decks
-* Simple, fast and natural design
-* Full Android Wear and tablet support
-.
-
-Repo Type:git
-Repo:https://github.com/saschpe/PlanningPoker
-
-Build:1.2.7,170127
-    commit=34409fc6252ab6a20bf36ccc3802b769afd58c88
-    subdir=mobile
-    gradle=yes
-    prebuild=sed -i -e "s|, ':wear'||" ../settings.gradle && \
-        rm -rf ../wear
-
-Maintainer Notes:
-The wear folder confuses checkupdates and it finds the wrong VersionCode.
-We can still leave UCM set but have to fix VC from mobile subdir every update.
-.
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.3.2
-Current Version Code:241132
--- a/metadata/saschpe.poker.yml
+++ b/metadata/saschpe.poker.yml
@ -0,0 +1,39 @@
+Categories:
+  - System
+License: Apache-2.0
+WebSite: https://play.google.com/store/apps/details?id=saschpe.poker
+SourceCode: https://github.com/saschpe/PlanningPoker
+IssueTracker: https://github.com/saschpe/PlanningPoker/issues
+
+Summary: Planning Poker for phone, tablet and wear devices
+Description: |-
+    A technique for estimating development goals in software development.
+
+    Features:
+
+    * Fibonacci, T-Shirt Size and Ideal Days card decks
+    * Simple, fast and natural design
+    * Full Android Wear and tablet support
+
+RepoType: git
+Repo: https://github.com/saschpe/PlanningPoker
+
+Builds:
+  - versionName: 1.2.7
+    versionCode: 170127
+    commit: 34409fc6252ab6a20bf36ccc3802b769afd58c88
+    subdir: mobile
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e "s|, ':wear'||" ../settings.gradle
+      - rm -rf ../wear
+
+MaintainerNotes: |-
+    The wear folder confuses checkupdates and it finds the wrong VersionCode.
+    We can still leave UCM set but have to fix VC from mobile subdir every update.
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.3.2
+CurrentVersionCode: 241132
--- a/metadata/science.itaintrocket.pomfshare.txt
+++ b/metadata/science.itaintrocket.pomfshare.txt
@ -1,30 +0,0 @@
-Categories:Internet
-License:GPL-2.0-or-later
-Web Site:
-Source Code:https://github.com/Nyubis/Pomfshare
-Issue Tracker:https://github.com/Nyubis/Pomfshare/issues
-Changelog:https://github.com/Nyubis/Pomfshare/releases
-
-Auto Name:Pomfshare
-Summary:Client for pomf.se
-Description:
-Pomshare uses Android's built-in sharing menu to easily upload files to
-[http://pomf.se pomf.se], a free quality filehost. No timeouts, no logins. 50
-MiB maximum.
-.
-
-Repo Type:git
-Repo:https://github.com/Nyubis/Pomfshare
-
-Build:1.0,1
-    commit=ae6a909ebc10a4726dd4fee833b6eb680dfb928c
-
-Build:0.4.1,2
-    commit=6f3ce3a0db98b8d2259506062c41d2c47f2348df
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.4.1
-Current Version Code:2
--- a/metadata/science.itaintrocket.pomfshare.yml
+++ b/metadata/science.itaintrocket.pomfshare.yml
@ -0,0 +1,33 @@
+Categories:
+  - Internet
+License: GPL-2.0-or-later
+SourceCode: https://github.com/Nyubis/Pomfshare
+IssueTracker: https://github.com/Nyubis/Pomfshare/issues
+Changelog: https://github.com/Nyubis/Pomfshare/releases
+
+AutoName: Pomfshare
+Summary: Client for pomf.se
+Description: |-
+    Pomshare uses Android's built-in sharing menu to easily upload files to
+    [http://pomf.se pomf.se], a free quality filehost. No timeouts, no logins. 50
+    MiB maximum.
+
+RepoType: git
+Repo: https://github.com/Nyubis/Pomfshare
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: ae6a909ebc10a4726dd4fee833b6eb680dfb928c
+
+  - versionName: 0.4.1
+    versionCode: 2
+    commit: 6f3ce3a0db98b8d2259506062c41d2c47f2348df
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 0.4.1
+CurrentVersionCode: 2
--- a/metadata/se.anyro.nfc_reader.txt
+++ b/metadata/se.anyro.nfc_reader.txt
@ -1,39 +0,0 @@
-Categories:Connectivity
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/nadam/nfc-reader
-Issue Tracker:https://github.com/nadam/nfc-reader/issues
-
-Auto Name:NFC Reader
-Summary:Read NFC tag info
-Description:
-Simple app for reading and displaying various tags (NDEF, RFID, FeliCa, ISO
-14443, etc) using NFC (Near Field Communication). The app also supports basic
-NDEF Push (Android Beam) for people who don't have any tag to read but happen to
-have two NFC enabled phones.
-.
-
-Repo Type:git
-Repo:https://github.com/nadam/nfc-reader.git
-
-Build:0.10,10
-    commit=a3e9b61c87
-    prebuild=rm -rf market
-
-Build:0.12,12
-    commit=5e6388571
-
-Build:0.13,13
-    commit=ac621cc0283
-
-Build:0.14,14
-    commit=ab31a4dce8306b983033c190d3dca53d6254785d
-
-Build:0.15,15
-    commit=58c116bb2b9dae930f0983d9078c03b5b82f9cd6
-    prebuild=echo -e 'java.source=1.7\njava.target=1.7' > ant.properties
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.15
-Current Version Code:15
--- a/metadata/se.anyro.nfc_reader.yml
+++ b/metadata/se.anyro.nfc_reader.yml
@ -0,0 +1,44 @@
+Categories:
+  - Connectivity
+License: Apache-2.0
+SourceCode: https://github.com/nadam/nfc-reader
+IssueTracker: https://github.com/nadam/nfc-reader/issues
+
+AutoName: NFC Reader
+Summary: Read NFC tag info
+Description: |-
+    Simple app for reading and displaying various tags (NDEF, RFID, FeliCa, ISO
+    14443, etc) using NFC (Near Field Communication). The app also supports basic
+    NDEF Push (Android Beam) for people who don't have any tag to read but happen to
+    have two NFC enabled phones.
+
+RepoType: git
+Repo: https://github.com/nadam/nfc-reader.git
+
+Builds:
+  - versionName: '0.10'
+    versionCode: 10
+    commit: a3e9b61c87
+    prebuild: rm -rf market
+
+  - versionName: '0.12'
+    versionCode: 12
+    commit: '5e6388571'
+
+  - versionName: '0.13'
+    versionCode: 13
+    commit: ac621cc0283
+
+  - versionName: '0.14'
+    versionCode: 14
+    commit: ab31a4dce8306b983033c190d3dca53d6254785d
+
+  - versionName: '0.15'
+    versionCode: 15
+    commit: 58c116bb2b9dae930f0983d9078c03b5b82f9cd6
+    prebuild: echo -e 'java.source=1.7\njava.target=1.7' > ant.properties
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '0.15'
+CurrentVersionCode: 15
--- a/metadata/se.chalmers.doit.txt
+++ b/metadata/se.chalmers.doit.txt
@ -1,25 +0,0 @@
-Disabled:Let's forget this one: alpha and probably won't get any more revisions
-Categories:Writing
-License:GPL-3.0-only
-Web Site:https://code.google.com/p/dat255-doit
-Source Code:https://code.google.com/p/dat255-doit/source
-Issue Tracker:
-
-Auto Name:doIT
-Summary:Todo lists
-Description:
-Create tasks and sort by due date or priority.
-.
-
-Repo Type:git-svn
-Repo:https://dat255-doit.googlecode.com/svn/trunk
-
-Build:1.0,1
-    commit=110
-    subdir=doIT
-    target=android-10
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.0
-Current Version Code:1
--- a/metadata/se.danielj.geometridestroyer.txt
+++ b/metadata/se.danielj.geometridestroyer.txt
@ -1,28 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:http://danielj.se/geometri-destroyer
-Source Code:https://github.com/MaTachi/geometri-destroyer
-Issue Tracker:https://github.com/MaTachi/geometri-destroyer/issues
-
-Auto Name:Geometri Destroyer
-Summary:Simple game
-Description:
-Remove the green objects but don't let the blue objects touch the ground.
-.
-
-Repo Type:git
-Repo:https://github.com/MaTachi/geometri-destroyer.git
-
-Build:1.0.1,2
-    commit=1aa2e
-    subdir=geometri-destroyer-android
-    init=zip -r native.zip libs/armeabi* && \
-        mv ../geometri-destroyer/libs/gdx.jar libs/ && \
-        mv ../geometri-destroyer/libs/gdx-freetype.jar libs/ && \
-        echo 'source.dir=src;../geometri-destroyer/src' > ant.properties
-    build=unzip native.zip
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0.1
-Current Version Code:2
--- a/metadata/se.danielj.geometridestroyer.yml
+++ b/metadata/se.danielj.geometridestroyer.yml
@ -0,0 +1,30 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+WebSite: http://danielj.se/geometri-destroyer
+SourceCode: https://github.com/MaTachi/geometri-destroyer
+IssueTracker: https://github.com/MaTachi/geometri-destroyer/issues
+
+AutoName: Geometri Destroyer
+Summary: Simple game
+Description: Remove the green objects but don't let the blue objects touch the ground.
+
+RepoType: git
+Repo: https://github.com/MaTachi/geometri-destroyer.git
+
+Builds:
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 1aa2e
+    subdir: geometri-destroyer-android
+    init:
+      - zip -r native.zip libs/armeabi*
+      - mv ../geometri-destroyer/libs/gdx.jar libs/
+      - mv ../geometri-destroyer/libs/gdx-freetype.jar libs/
+      - echo 'source.dir=src;../geometri-destroyer/src' > ant.properties
+    build: unzip native.zip
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.0.1
+CurrentVersionCode: 2
--- a/metadata/se.embargo.retroboy.txt
+++ b/metadata/se.embargo.retroboy.txt
@ -1,43 +0,0 @@
-Categories:Multimedia
-License:MIT
-Web Site:
-Source Code:https://github.com/mikljohansson/retroboy
-Issue Tracker:https://github.com/mikljohansson/retroboy/issues
-Changelog:https://github.com/mikljohansson/retroboy/releases
-
-Auto Name:Retroboy
-Summary:Retroboy provides vintage imaging technology
-Description:
-Retroboy provides vintage imaging technology not seen since the digital cameras
-and monochrome screens of the previous century. A series of real time filters
-implement various image processing algorithms, to emulate the graphic experience
-of classic hardware.
-
-* 4-tone Bayer dithering as found on the Nintendo® Game Boy® Camera
-* Amstrad CPC filter with 27 color palette
-* PXL-2000 PixelVision filter emulating one of the first digital video cameras
-* Commodore 64 filter with VIC-II 16-color palette
-* Atkinson dithering filter used by the original Apple® Macintosh® OS
-* Halftone dot filter as popularized by Roy Lichtenstein and the pop art movement
-* Record animated GIF movies
-* Scene mode setting to support for example low light exposure
-* Zoom using the volume rocker
-* Adjust the dynamic contrast to further enhance your photos
-* Process images from your gallery by tapping the share button and selecting Retroboy
-* Share your pictures through Facebook, Twitter, Tumblr, MMS, E-mail or any other methods your device supports
-.
-
-Repo Type:git
-Repo:https://github.com/mikljohansson/retroboy
-
-Build:2.5.2,44
-    commit=a206a96
-    subdir=app
-    gradle=yes
-    srclibs=embargo-core@5fe321d
-    prebuild=sed -i 's#../android-core#app/$$embargo-core$$#g' ../settings.gradle
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:2.5.2
-Current Version Code:44
--- a/metadata/se.embargo.retroboy.yml
+++ b/metadata/se.embargo.retroboy.yml
@ -0,0 +1,46 @@
+Categories:
+  - Multimedia
+License: MIT
+SourceCode: https://github.com/mikljohansson/retroboy
+IssueTracker: https://github.com/mikljohansson/retroboy/issues
+Changelog: https://github.com/mikljohansson/retroboy/releases
+
+AutoName: Retroboy
+Summary: Retroboy provides vintage imaging technology
+Description: |-
+    Retroboy provides vintage imaging technology not seen since the digital cameras
+    and monochrome screens of the previous century. A series of real time filters
+    implement various image processing algorithms, to emulate the graphic experience
+    of classic hardware.
+
+    * 4-tone Bayer dithering as found on the Nintendo® Game Boy® Camera
+    * Amstrad CPC filter with 27 color palette
+    * PXL-2000 PixelVision filter emulating one of the first digital video cameras
+    * Commodore 64 filter with VIC-II 16-color palette
+    * Atkinson dithering filter used by the original Apple® Macintosh® OS
+    * Halftone dot filter as popularized by Roy Lichtenstein and the pop art movement
+    * Record animated GIF movies
+    * Scene mode setting to support for example low light exposure
+    * Zoom using the volume rocker
+    * Adjust the dynamic contrast to further enhance your photos
+    * Process images from your gallery by tapping the share button and selecting Retroboy
+    * Share your pictures through Facebook, Twitter, Tumblr, MMS, E-mail or any other methods your device supports
+
+RepoType: git
+Repo: https://github.com/mikljohansson/retroboy
+
+Builds:
+  - versionName: 2.5.2
+    versionCode: 44
+    commit: a206a96
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - embargo-core@5fe321d
+    prebuild: sed -i 's#../android-core#app/$$embargo-core$$#g' ../settings.gradle
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: 2.5.2
+CurrentVersionCode: 44
--- a/metadata/se.erikofsweden.findmyphone.txt
+++ b/metadata/se.erikofsweden.findmyphone.txt
@ -1,46 +0,0 @@
-Categories:System
-License:GPL-2.0-only
-Web Site:https://erikofsweden.blogspot.com/p/findmyphone.html
-Source Code:https://sourceforge.net/scm/?type=svn&group_id=335164
-Issue Tracker:https://sourceforge.net/p/findmyphone/_list/tickets?source=navbar
-Changelog:https://erikofsweden.blogspot.de/p/findmyphone.html
-
-Auto Name:FindMyPhone
-Summary:Helps you find a mislaid phone
-Description:
-If you lose your phone having this app installed can help you find it. Upon
-receipt of an SMS or email, FindMyPhone gets your location and communicates the
-location back to the owner. Note that GPS may need be enabled and the phone
-within view of the sky for an accurate location to be obtained. The app will
-fall back to using Google's network location API, but we recommend you disable
-that nonfree software anyway. Currently supports activating by sending a secret
-message via SMS or an email to K-9 Mail. The resulting location is sent via SMS.
-
-Status: Beta.
-.
-
-Repo Type:git-svn
-Repo:https://svn.code.sf.net/p/findmyphone/code/trunk/
-
-Build:1.21B,10
-    commit=33
-    prebuild=mv lib libs
-
-Build:1.22B,11
-    commit=34
-    prebuild=mv lib libs
-
-Build:1.23B,13
-    commit=38
-    srclibs=javamail@JAVAMAIL-1_6_1
-    rm=lib
-    build=pushd $$javamail$$/mail && \
-        mvn package -DskipTests && \
-        popd && \
-        mkdir libs && \
-        cp $$javamail$$/mail/target/javax.mail.jar libs
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.23B
-Current Version Code:13
--- a/metadata/se.erikofsweden.findmyphone.yml
+++ b/metadata/se.erikofsweden.findmyphone.yml
@ -0,0 +1,53 @@
+Categories:
+  - System
+License: GPL-2.0-only
+WebSite: https://erikofsweden.blogspot.com/p/findmyphone.html
+SourceCode: https://sourceforge.net/scm/?type=svn&group_id=335164
+IssueTracker: https://sourceforge.net/p/findmyphone/_list/tickets?source=navbar
+Changelog: https://erikofsweden.blogspot.de/p/findmyphone.html
+
+AutoName: FindMyPhone
+Summary: Helps you find a mislaid phone
+Description: |-
+    If you lose your phone having this app installed can help you find it. Upon
+    receipt of an SMS or email, FindMyPhone gets your location and communicates the
+    location back to the owner. Note that GPS may need be enabled and the phone
+    within view of the sky for an accurate location to be obtained. The app will
+    fall back to using Google's network location API, but we recommend you disable
+    that nonfree software anyway. Currently supports activating by sending a secret
+    message via SMS or an email to K-9 Mail. The resulting location is sent via SMS.
+
+    Status: Beta.
+
+RepoType: git-svn
+Repo: https://svn.code.sf.net/p/findmyphone/code/trunk/
+
+Builds:
+  - versionName: 1.21B
+    versionCode: 10
+    commit: '33'
+    prebuild: mv lib libs
+
+  - versionName: 1.22B
+    versionCode: 11
+    commit: '34'
+    prebuild: mv lib libs
+
+  - versionName: 1.23B
+    versionCode: 13
+    commit: '38'
+    srclibs:
+      - javamail@JAVAMAIL-1_6_1
+    rm:
+      - lib
+    build:
+      - pushd $$javamail$$/mail
+      - mvn package -DskipTests
+      - popd
+      - mkdir libs
+      - cp $$javamail$$/mail/target/javax.mail.jar libs
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.23B
+CurrentVersionCode: 13
--- a/metadata/se.johanhil.clipboard.txt
+++ b/metadata/se.johanhil.clipboard.txt
@ -1,27 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/johanhil/copy-to-clipboard
-Issue Tracker:https://github.com/johanhil/copy-to-clipboard/issues
-
-Auto Name:Copy to Clipboard
-Summary:Copy via the share menu
-Description:
-Copy to Clipboard integrates in to the Share menu, allowing you to copy text to
-the clipboard instead of sharing via an SMS/e-mail/tweet/etc.
-
-This is useful when you want to share text to an application that does not
-implement the regular "send to" functionality, such as GTalk.
-.
-
-Repo Type:git
-Repo:https://github.com/johanhil/copy-to-clipboard.git
-
-Build:1.0,2
-    commit=c6c466770fb7215d957118216c2414ae69ca1bc8
-    target=android-4
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0
-Current Version Code:2
--- a/metadata/se.johanhil.clipboard.yml
+++ b/metadata/se.johanhil.clipboard.yml
@ -0,0 +1,28 @@
+Categories:
+  - System
+License: GPL-3.0-only
+SourceCode: https://github.com/johanhil/copy-to-clipboard
+IssueTracker: https://github.com/johanhil/copy-to-clipboard/issues
+
+AutoName: Copy to Clipboard
+Summary: Copy via the share menu
+Description: |-
+    Copy to Clipboard integrates in to the Share menu, allowing you to copy text to
+    the clipboard instead of sharing via an SMS/e-mail/tweet/etc.
+
+    This is useful when you want to share text to an application that does not
+    implement the regular "send to" functionality, such as GTalk.
+
+RepoType: git
+Repo: https://github.com/johanhil/copy-to-clipboard.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 2
+    commit: c6c466770fb7215d957118216c2414ae69ca1bc8
+    target: android-4
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.0'
+CurrentVersionCode: 2
--- a/metadata/se.johanhil.duckduckgo.txt
+++ b/metadata/se.johanhil.duckduckgo.txt
@ -1,32 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Internet
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/johanhil/ddg-android
-Issue Tracker:https://github.com/johanhil/ddg-android/issues
-
-Auto Name:Duck Duck Go
-Summary:DuckDuckGo search provider
-Description:
-'''N.B''' This isn't related to the official DuckDuckGo app.
-
-Integrates the search engine DuckDuckGo with the Android OS. It adds another web
-search provider to the system and some neat suggestions for the user.
-
-There is an option to use DDG in the CyanogenMod 10 browser (depending on the
-locale), and also in [[org.tint]].
-
-Firefox allows you make search engines by long-pressing any input field.
-.
-
-Repo Type:git
-Repo:https://github.com/johanhil/ddg-android.git
-
-Build:0.1,1
-    commit=5a8b23c01eff6560bb9f5a815187c389f421b2b2
-    target=android-4
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.1
-Current Version Code:1
--- a/metadata/se.johanhil.duckduckgo.yml
+++ b/metadata/se.johanhil.duckduckgo.yml
@ -0,0 +1,34 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Internet
+License: Apache-2.0
+SourceCode: https://github.com/johanhil/ddg-android
+IssueTracker: https://github.com/johanhil/ddg-android/issues
+
+AutoName: Duck Duck Go
+Summary: DuckDuckGo search provider
+Description: |-
+    '''N.B''' This isn't related to the official DuckDuckGo app.
+
+    Integrates the search engine DuckDuckGo with the Android OS. It adds another web
+    search provider to the system and some neat suggestions for the user.
+
+    There is an option to use DDG in the CyanogenMod 10 browser (depending on the
+    locale), and also in [[org.tint]].
+
+    Firefox allows you make search engines by long-pressing any input field.
+
+RepoType: git
+Repo: https://github.com/johanhil/ddg-android.git
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: 5a8b23c01eff6560bb9f5a815187c389f421b2b2
+    target: android-4
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '0.1'
+CurrentVersionCode: 1
--- a/metadata/se.leap.bitmaskclient.txt
+++ b/metadata/se.leap.bitmaskclient.txt
@ -1,69 +0,0 @@
-Categories:Internet,Security,Security
-License:GPL-3.0-only
-Web Site:https://bitmask.net
-Source Code:https://0xacab.org/leap/bitmask_android
-Issue Tracker:https://0xacab.org/leap/bitmask_android/issues
-Changelog:https://0xacab.org/leap/bitmask_android/blob/HEAD/CHANGELOG
-Donate:https://leap.se/en/about-us/donate
-Bitcoin:1Fze6GLjoxFnwAGNreYLK8ktFdGJdPRxeY
-
-Auto Name:Bitmask
-Summary:Easy and secure encrypted communication (VPN)
-Description:
-Bitmask is an application to provide easy and secure encrypted communication.
-You can choose among several different service providers or start your own.
-Currently, Bitmask supports encrypted internet (VPN) with encrypted email coming
-soon.
-
-Bitmask is a VPN client using OpenVPN with automatic configuration. Just enter
-your account information from any compatible service provider and away you go.
-
-By encrypting and securely routing all your network traffic through your
-Bitmask-compatible service provider, Bitmask is able to prevent many forms of
-censorship and surveillance.
-.
-
-Repo Type:git
-Repo:https://0xacab.org/leap/bitmask_android
-
-Build:0.9.7,131
-    commit=0.9.7
-    subdir=app
-    submodules=yes
-    gradle=production
-    build=misc/build-native.sh
-    ndk=r15c
-
-Build:0.9.8,134
-    commit=0.9.8
-    subdir=app
-    submodules=yes
-    gradle=production
-    rm=ics-openvpn/main/src/main/cpp/mbedtls/tests
-    prebuild=sed -i -e 's|./gradlew|gradle|' ../build_deps.sh
-    build=cd .. && \
-        ./build_deps.sh
-    ndk=r16b
-
-Build:0.9.9,136
-    commit=0.9.9
-    subdir=app
-    submodules=yes
-    gradle=normalProduction
-    rm=ics-openvpn/main/src/main/cpp/mbedtls/tests
-    prebuild=sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-    build=cd .. && \
-        echo '/opt/gradle/versions/4.6/bin/gradle "$@"' > ics-openvpn/gradlew && \
-        chmod a+x ics-openvpn/gradlew && \
-        ./build_deps.sh
-    ndk=r16b
-
-Maintainer Notes:
-Use absolute path to the proper Gradle version in ics-openvpn/gradlew until
-fdroidserver@8e471ad8 is deployed.
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags ^[0-9.]+$
-Current Version:0.9.9
-Current Version Code:136
--- a/metadata/se.leap.bitmaskclient.yml
+++ b/metadata/se.leap.bitmaskclient.yml
@ -0,0 +1,81 @@
+Categories:
+  - Internet
+  - Security
+  - Security
+License: GPL-3.0-only
+WebSite: https://bitmask.net
+SourceCode: https://0xacab.org/leap/bitmask_android
+IssueTracker: https://0xacab.org/leap/bitmask_android/issues
+Changelog: https://0xacab.org/leap/bitmask_android/blob/HEAD/CHANGELOG
+Donate: https://leap.se/en/about-us/donate
+Bitcoin: 1Fze6GLjoxFnwAGNreYLK8ktFdGJdPRxeY
+
+AutoName: Bitmask
+Summary: Easy and secure encrypted communication (VPN)
+Description: |-
+    Bitmask is an application to provide easy and secure encrypted communication.
+    You can choose among several different service providers or start your own.
+    Currently, Bitmask supports encrypted internet (VPN) with encrypted email coming
+    soon.
+
+    Bitmask is a VPN client using OpenVPN with automatic configuration. Just enter
+    your account information from any compatible service provider and away you go.
+
+    By encrypting and securely routing all your network traffic through your
+    Bitmask-compatible service provider, Bitmask is able to prevent many forms of
+    censorship and surveillance.
+
+RepoType: git
+Repo: https://0xacab.org/leap/bitmask_android
+
+Builds:
+  - versionName: 0.9.7
+    versionCode: 131
+    commit: 0.9.7
+    subdir: app
+    submodules: true
+    gradle:
+      - production
+    build: misc/build-native.sh
+    ndk: r15c
+
+  - versionName: 0.9.8
+    versionCode: 134
+    commit: 0.9.8
+    subdir: app
+    submodules: true
+    gradle:
+      - production
+    rm:
+      - ics-openvpn/main/src/main/cpp/mbedtls/tests
+    prebuild: sed -i -e 's|./gradlew|gradle|' ../build_deps.sh
+    build:
+      - cd ..
+      - ./build_deps.sh
+    ndk: r16b
+
+  - versionName: 0.9.9
+    versionCode: 136
+    commit: 0.9.9
+    subdir: app
+    submodules: true
+    gradle:
+      - normalProduction
+    rm:
+      - ics-openvpn/main/src/main/cpp/mbedtls/tests
+    prebuild: sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
+    build:
+      - cd ..
+      - echo '/opt/gradle/versions/4.6/bin/gradle "$@"' > ics-openvpn/gradlew
+      - chmod a+x ics-openvpn/gradlew
+      - ./build_deps.sh
+    ndk: r16b
+
+MaintainerNotes: |-
+    Use absolute path to the proper Gradle version in ics-openvpn/gradlew until
+    fdroidserver@8e471ad8 is deployed.
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags ^[0-9.]+$
+CurrentVersion: 0.9.9
+CurrentVersionCode: 136
--- a/metadata/se.leap.riseupvpn.txt
+++ b/metadata/se.leap.riseupvpn.txt
@ -1,46 +0,0 @@
-Categories:Internet,Security
-License:GPL-3.0-only
-Web Site:https://riseup.net
-Source Code:https://0xacab.org/leap/bitmask_android
-Issue Tracker:https://0xacab.org/leap/bitmask_android/issues
-Changelog:https://0xacab.org/leap/bitmask_android/blob/HEAD/CHANGELOG
-Donate:https://riseup.net/vpn/donate
-Bitcoin:1F3KowUJBfvocr1H6DRvwFxfETJ18e8Dp6
-
-Auto Name:RiseupVPN
-Summary:Secure VPN powered by Bitmask
-Description:
-RiseupVPN is an application to provide easy and secure encrypted communication.
-The app is a custom branded build of [[se.leap.bitmaskclient]]. This version is
-preconfigured with one trusted provider - the Riseup collective - and allows
-anonymous VPN usage without any manual setup.
-
-By encrypting and securely routing all your network traffic through Riseup's
-servers, RiseupVPN is able to prevent many forms of censorship and surveillance.
-.
-
-Repo Type:git
-Repo:https://0xacab.org/leap/bitmask_android.git
-
-Build:0.9.9,136
-    commit=0.9.9
-    subdir=app
-    submodules=yes
-    gradle=customProduction
-    rm=ics-openvpn/main/src/main/cpp/mbedtls/tests
-    prebuild=sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-    build=cd .. && \
-        echo '/opt/gradle/versions/4.6/bin/gradle "$@"' > ics-openvpn/gradlew && \
-        chmod a+x ics-openvpn/gradlew && \
-        ./build_deps.sh
-    ndk=r16b
-
-Maintainer Notes:
-Use absolute path to the proper Gradle version in ics-openvpn/gradlew until
-fdroidserver@8e471ad8 is deployed.
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags ^[0-9.]+$
-Current Version:0.9.9
-Current Version Code:136
--- a/metadata/se.leap.riseupvpn.yml
+++ b/metadata/se.leap.riseupvpn.yml
@ -0,0 +1,51 @@
+Categories:
+  - Internet
+  - Security
+License: GPL-3.0-only
+WebSite: https://riseup.net
+SourceCode: https://0xacab.org/leap/bitmask_android
+IssueTracker: https://0xacab.org/leap/bitmask_android/issues
+Changelog: https://0xacab.org/leap/bitmask_android/blob/HEAD/CHANGELOG
+Donate: https://riseup.net/vpn/donate
+Bitcoin: 1F3KowUJBfvocr1H6DRvwFxfETJ18e8Dp6
+
+AutoName: RiseupVPN
+Summary: Secure VPN powered by Bitmask
+Description: |-
+    RiseupVPN is an application to provide easy and secure encrypted communication.
+    The app is a custom branded build of [[se.leap.bitmaskclient]]. This version is
+    preconfigured with one trusted provider - the Riseup collective - and allows
+    anonymous VPN usage without any manual setup.
+
+    By encrypting and securely routing all your network traffic through Riseup's
+    servers, RiseupVPN is able to prevent many forms of censorship and surveillance.
+
+RepoType: git
+Repo: https://0xacab.org/leap/bitmask_android.git
+
+Builds:
+  - versionName: 0.9.9
+    versionCode: 136
+    commit: 0.9.9
+    subdir: app
+    submodules: true
+    gradle:
+      - customProduction
+    rm:
+      - ics-openvpn/main/src/main/cpp/mbedtls/tests
+    prebuild: sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
+    build:
+      - cd ..
+      - echo '/opt/gradle/versions/4.6/bin/gradle "$@"' > ics-openvpn/gradlew
+      - chmod a+x ics-openvpn/gradlew
+      - ./build_deps.sh
+    ndk: r16b
+
+MaintainerNotes: |-
+    Use absolute path to the proper Gradle version in ics-openvpn/gradlew until
+    fdroidserver@8e471ad8 is deployed.
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags ^[0-9.]+$
+CurrentVersion: 0.9.9
+CurrentVersionCode: 136
--- a/metadata/se.norenh.rkfread.txt
+++ b/metadata/se.norenh.rkfread.txt
@ -1,45 +0,0 @@
-Categories:Navigation
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/norenh/RKFRead
-Issue Tracker:https://github.com/norenh/RKFRead/issues
-Changelog:https://github.com/norenh/RKFRead/releases
-
-Auto Name:RKFRead
-Summary:Transport card reader
-Description:
-NFC reader for public travelcards in Sweden and Denmark. It supports reading
-cards following the RKF standards and is tested with cards from the following
-providers:
-
-* Skånetrafiken JOJO
-* Länstrafiken kronoberg
-* Norrbotten
-* SL
-* Västtrafiken
-* Rejsekort A/S
-
-Note that your NFC device must support reading Mifare classic cards, which is
-unfortunately not possible on several handsets.
-.
-
-Repo Type:git
-Repo:https://github.com/norenh/RKFRead.git
-
-Build:1.1,2
-    commit=1.1
-    subdir=RKFRead
-
-Build:1.2,3
-    commit=1.2
-    subdir=RKFRead
-
-Build:1.3,4
-    commit=1.3
-    subdir=RKFRead/app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:4
--- a/metadata/se.norenh.rkfread.yml
+++ b/metadata/se.norenh.rkfread.yml
@ -0,0 +1,49 @@
+Categories:
+  - Navigation
+License: GPL-3.0-or-later
+SourceCode: https://github.com/norenh/RKFRead
+IssueTracker: https://github.com/norenh/RKFRead/issues
+Changelog: https://github.com/norenh/RKFRead/releases
+
+AutoName: RKFRead
+Summary: Transport card reader
+Description: |-
+    NFC reader for public travelcards in Sweden and Denmark. It supports reading
+    cards following the RKF standards and is tested with cards from the following
+    providers:
+
+    * Skånetrafiken JOJO
+    * Länstrafiken kronoberg
+    * Norrbotten
+    * SL
+    * Västtrafiken
+    * Rejsekort A/S
+
+    Note that your NFC device must support reading Mifare classic cards, which is
+    unfortunately not possible on several handsets.
+
+RepoType: git
+Repo: https://github.com/norenh/RKFRead.git
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 2
+    commit: '1.1'
+    subdir: RKFRead
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: '1.2'
+    subdir: RKFRead
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: '1.3'
+    subdir: RKFRead/app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.3'
+CurrentVersionCode: 4
--- a/metadata/se.peterbjorkman.android.trafikinfo.txt
+++ b/metadata/se.peterbjorkman.android.trafikinfo.txt
@ -1,34 +0,0 @@
-Disabled:Not much good without maps and no longer developed
-AntiFeatures:NonFreeDep
-Categories:Navigation
-License:GPL-3.0-or-later
-Web Site:http://android.trafikinfo.nu
-Source Code:https://code.google.com/p/trafikinfoandroid/source
-Issue Tracker:
-
-Auto Name:Trafikinfo.nu
-Summary:Show Swedish traffic information
-Description:
-This application shows traffic information received from Trafikverket, the
-Swedish Transport Administration.
-
-Requires proprietary Google Maps to be installed on your device and even then
-the maps won't be visible because F-droid can't include API keys in the build.
-If you need the maps feature try the developer build from the website.
-.
-
-Repo Type:git-svn
-Repo:https://trafikinfoandroid.googlecode.com/svn/trunk
-
-Build:0.9,12
-    commit=628
-    encoding=utf-8
-
-Build:0.9.1,13
-    commit=630
-    encoding=utf-8
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.9.1
-Current Version Code:13
--- a/metadata/se.pp.mc.android.Gerberoid.txt
+++ b/metadata/se.pp.mc.android.Gerberoid.txt
@ -1,28 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-or-later
-Author Name:Marcus Comstedt
-Author Email:marcus@mc.pp.se
-Web Site:
-Source Code:https://github.com/zeldin/Gerberoid
-Issue Tracker:https://github.com/zeldin/Gerberoid/issues
-
-Auto Name:Gerberoid
-Summary:Viewer for Gerber files
-Description:
-A viewer for the Gerber PCB image files used in electronics CAD/CAM. The parser
-and renderer is based on code from the KiCad EDA suite, ensuring a high level of
-interoperability with those tools.
-.
-
-Repo Type:git
-Repo:https://github.com/zeldin/Gerberoid
-
-Build:1.0,10000
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags v\d+\.\d+(\.\d+)?
-Current Version:1.0
-Current Version Code:10000
--- a/metadata/se.pp.mc.android.Gerberoid.yml
+++ b/metadata/se.pp.mc.android.Gerberoid.yml
@ -0,0 +1,30 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-or-later
+AuthorName: Marcus Comstedt
+AuthorEmail: marcus@mc.pp.se
+SourceCode: https://github.com/zeldin/Gerberoid
+IssueTracker: https://github.com/zeldin/Gerberoid/issues
+
+AutoName: Gerberoid
+Summary: Viewer for Gerber files
+Description: |-
+    A viewer for the Gerber PCB image files used in electronics CAD/CAM. The parser
+    and renderer is based on code from the KiCad EDA suite, ensuring a high level of
+    interoperability with those tools.
+
+RepoType: git
+Repo: https://github.com/zeldin/Gerberoid
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 10000
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags v\d+\.\d+(\.\d+)?
+CurrentVersion: '1.0'
+CurrentVersionCode: 10000
--- a/metadata/se.traffar.dot_race.txt
+++ b/metadata/se.traffar.dot_race.txt
@ -1,64 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:https://bitbucket.org/przemekr/dot-race
-Source Code:https://bitbucket.org/przemekr/dot-race/src
-Issue Tracker:https://bitbucket.org/przemekr/dot-race/issues
-
-Auto Name:Dot-Race
-Summary:Simple, funny action game
-Description:
-Dot race is simple, but funny and fast action game. Take a control of your
-spaceship and compete with computer or an other player in collecting magic
-artifacts.
-
-The spaceship will accelerate toward your finger. To break put the finger behind
-the moving spaceship. There is also another controller 'virtual joystick'
-available also in two player game.
-.
-
-Repo Type:git
-Repo:https://bitbucket.org/przemekr/dot-race
-
-Build:0.1,1
-    commit=0.1
-    subdir=android
-    srclibs=SDL@release-2.0.3
-    prebuild=rm -rf jni/SDL/src jni/SDL/include && \
-        ln -s ../../$$SDL$$/src     jni/SDL/ && \
-        ln -s ../../$$SDL$$/include jni/SDL/ && \
-        echo "" > jni/SDL/src/dynapi/SDL_dynapi.h
-    buildjni=yes
-
-Build:0.2,2
-    commit=0.2
-    subdir=android
-    srclibs=SDL@release-2.0.3,SDL_mixer@release-2.0.0,SDL_image@release-2.0.0
-    prebuild=rm -rf jni/SDL/src jni/SDL/include jni/SDL_mixer jni/SDL_image && \
-        ln -s ../../$$SDL$$/src     jni/SDL/ && \
-        ln -s ../../$$SDL$$/include jni/SDL/ && \
-        ln -s ../$$SDL_mixer$$   jni/SDL_mixer && \
-        ln -s ../$$SDL_image$$   jni/SDL_image && \
-        echo "" > jni/SDL/src/dynapi/SDL_dynapi.h &&sed -i "s/SUPPORT_WEBP := true/SUPPORT_WEBP := false/"               jni/SDL_image/Android.mk &&sed -i "s/SUPPORT_JPG := true/SUPPORT_JPG := false/"                 jni/SDL_image/Android.mk &&sed -i "s/SUPPORT_MOD_MODPLUG := true/SUPPORT_MOD_MODPLUG := false/" jni/SDL_mixer/Android.mk &&sed -i "s/SUPPORT_MOD_MIKMOD := true/SUPPORT_MOD_MIKMOD := false/"   jni/SDL_mixer/Android.mk &&sed -i "s/SUPPORT_MP3_SMPEG := true/SUPPORT_MP3_SMPEG := false/"     jni/SDL_mixer/Android.mk
-    buildjni=yes
-
-Build:0.4,4
-    commit=0.4
-    subdir=android
-    srclibs=SDL@release-2.0.3,SDL_mixer@release-2.0.0,SDL_image@release-2.0.0
-    prebuild=rm -rf jni/SDL/src jni/SDL/include jni/SDL_mixer jni/SDL_image && \
-        ln -s ../../$$SDL$$/src     jni/SDL/ && \
-        ln -s ../../$$SDL$$/include jni/SDL/ && \
-        ln -s ../$$SDL_mixer$$   jni/SDL_mixer && \
-        ln -s ../$$SDL_image$$   jni/SDL_image && \
-        echo "" > jni/SDL/src/dynapi/SDL_dynapi.h && \
-        sed -i "s/SUPPORT_WEBP := true/SUPPORT_WEBP := false/"               jni/SDL_image/Android.mk && \
-        sed -i "s/SUPPORT_JPG := true/SUPPORT_JPG := false/"                 jni/SDL_image/Android.mk && \
-        sed -i "s/SUPPORT_MOD_MODPLUG := true/SUPPORT_MOD_MODPLUG := false/" jni/SDL_mixer/Android.mk && \
-        sed -i "s/SUPPORT_MOD_MIKMOD := true/SUPPORT_MOD_MIKMOD := false/"   jni/SDL_mixer/Android.mk && \
-        sed -i "s/SUPPORT_MP3_SMPEG := true/SUPPORT_MP3_SMPEG := false/"     jni/SDL_mixer/Android.mk
-    buildjni=yes
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:0.4
-Current Version Code:4
--- a/metadata/se.traffar.dot_race.yml
+++ b/metadata/se.traffar.dot_race.yml
@ -0,0 +1,86 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+WebSite: https://bitbucket.org/przemekr/dot-race
+SourceCode: https://bitbucket.org/przemekr/dot-race/src
+IssueTracker: https://bitbucket.org/przemekr/dot-race/issues
+
+AutoName: Dot-Race
+Summary: Simple, funny action game
+Description: |-
+    Dot race is simple, but funny and fast action game. Take a control of your
+    spaceship and compete with computer or an other player in collecting magic
+    artifacts.
+
+    The spaceship will accelerate toward your finger. To break put the finger behind
+    the moving spaceship. There is also another controller 'virtual joystick'
+    available also in two player game.
+
+RepoType: git
+Repo: https://bitbucket.org/przemekr/dot-race
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: '0.1'
+    subdir: android
+    srclibs:
+      - SDL@release-2.0.3
+    prebuild:
+      - rm -rf jni/SDL/src jni/SDL/include
+      - ln -s ../../$$SDL$$/src     jni/SDL/
+      - ln -s ../../$$SDL$$/include jni/SDL/
+      - echo "" > jni/SDL/src/dynapi/SDL_dynapi.h
+    buildjni:
+      - yes
+
+  - versionName: '0.2'
+    versionCode: 2
+    commit: '0.2'
+    subdir: android
+    srclibs:
+      - SDL@release-2.0.3
+      - SDL_mixer@release-2.0.0
+      - SDL_image@release-2.0.0
+    prebuild:
+      - rm -rf jni/SDL/src jni/SDL/include jni/SDL_mixer jni/SDL_image
+      - ln -s ../../$$SDL$$/src     jni/SDL/
+      - ln -s ../../$$SDL$$/include jni/SDL/
+      - ln -s ../$$SDL_mixer$$   jni/SDL_mixer
+      - ln -s ../$$SDL_image$$   jni/SDL_image
+      - echo "" > jni/SDL/src/dynapi/SDL_dynapi.h &&sed -i "s/SUPPORT_WEBP := true/SUPPORT_WEBP
+        := false/"               jni/SDL_image/Android.mk &&sed -i "s/SUPPORT_JPG
+        := true/SUPPORT_JPG := false/"                 jni/SDL_image/Android.mk &&sed
+        -i "s/SUPPORT_MOD_MODPLUG := true/SUPPORT_MOD_MODPLUG := false/" jni/SDL_mixer/Android.mk
+        &&sed -i "s/SUPPORT_MOD_MIKMOD := true/SUPPORT_MOD_MIKMOD := false/"   jni/SDL_mixer/Android.mk
+        &&sed -i "s/SUPPORT_MP3_SMPEG := true/SUPPORT_MP3_SMPEG := false/"     jni/SDL_mixer/Android.mk
+    buildjni:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 4
+    commit: '0.4'
+    subdir: android
+    srclibs:
+      - SDL@release-2.0.3
+      - SDL_mixer@release-2.0.0
+      - SDL_image@release-2.0.0
+    prebuild:
+      - rm -rf jni/SDL/src jni/SDL/include jni/SDL_mixer jni/SDL_image
+      - ln -s ../../$$SDL$$/src     jni/SDL/
+      - ln -s ../../$$SDL$$/include jni/SDL/
+      - ln -s ../$$SDL_mixer$$   jni/SDL_mixer
+      - ln -s ../$$SDL_image$$   jni/SDL_image
+      - echo "" > jni/SDL/src/dynapi/SDL_dynapi.h
+      - sed -i "s/SUPPORT_WEBP := true/SUPPORT_WEBP := false/"               jni/SDL_image/Android.mk
+      - sed -i "s/SUPPORT_JPG := true/SUPPORT_JPG := false/"                 jni/SDL_image/Android.mk
+      - sed -i "s/SUPPORT_MOD_MODPLUG := true/SUPPORT_MOD_MODPLUG := false/" jni/SDL_mixer/Android.mk
+      - sed -i "s/SUPPORT_MOD_MIKMOD := true/SUPPORT_MOD_MIKMOD := false/"   jni/SDL_mixer/Android.mk
+      - sed -i "s/SUPPORT_MP3_SMPEG := true/SUPPORT_MP3_SMPEG := false/"     jni/SDL_mixer/Android.mk
+    buildjni:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '0.4'
+CurrentVersionCode: 4
--- a/metadata/se.tube42.drum.android.txt
+++ b/metadata/se.tube42.drum.android.txt
@ -1,116 +0,0 @@
-Categories:Multimedia
-License:GPL-2.0-only
-Web Site:
-Source Code:https://github.com/tube42/drumon
-Issue Tracker:https://github.com/tube42/drumon/issues
-
-Auto Name:Drum On!
-Summary:Use your smartphone as a virtual drum
-Description:
-Simple and minimalist drum app that can, for example, be used to accompany
-guitar or bass players.
-.
-
-Repo Type:git
-Repo:https://github.com/tube42/drumon.git
-
-Build:0.1.3,13
-    commit=v0.1.3
-    submodules=yes
-    build=ant setup
-
-Build:0.1.4,14
-    commit=v0.1.4
-    submodules=yes
-    build=ant setup
-
-Build:0.1.5,15
-    commit=v0.1.5
-    submodules=yes
-    build=ant setup
-
-Build:0.1.6,16
-    commit=v0.1.6
-    submodules=yes
-    build=ant setup
-
-Build:0.1.7,17
-    commit=v0.1.7
-    submodules=yes
-    build=ant setup
-
-Build:0.1.8,18
-    commit=v0.1.8
-    submodules=yes
-    build=ant setup
-
-Build:0.1.9,19
-    commit=v0.1.9
-    submodules=yes
-    build=ant setup
-
-Build:0.2.0,20
-    commit=v0.2.0
-    submodules=yes
-    build=ant setup
-
-Build:0.2.1,21
-    commit=v0.2.1
-    submodules=yes
-    build=ant setup
-
-Build:0.2.2,22
-    commit=v0.2.2
-    submodules=yes
-    build=ant setup
-
-Build:0.2.3,23
-    commit=v0.2.3
-    submodules=yes
-    build=ant setup
-
-Build:0.2.4,24
-    commit=v0.2.4
-    submodules=yes
-    build=ant setup
-
-Build:0.2.6,26
-    commit=v0.2.6
-    submodules=yes
-    gradle=yes
-    output=android/build/outputs/apk/android-release-unsigned.apk
-    prebuild=sed -i -e 's/\"se.tube42.drumon\"/\"se.tube42.drum.android\"/' android/build.gradle
-    scanignore=android/libs
-
-Build:0.2.7,27
-    commit=v0.2.7
-    submodules=yes
-    gradle=yes
-    output=android/build/outputs/apk/android-release-unsigned.apk
-    scanignore=android/libs
-
-Build:0.2.8,28
-    commit=v0.2.8
-    submodules=yes
-    gradle=yes
-    output=android/build/outputs/apk/android-release-unsigned.apk
-    scanignore=android/libs
-
-Build:0.2.9,29
-    commit=v0.2.9
-    submodules=yes
-    gradle=yes
-    output=android/build/outputs/apk/android-release-unsigned.apk
-    scanignore=android/libs
-
-Build:0.3.0,30
-    commit=v0.3.0
-    subdir=android
-    submodules=yes
-    gradle=yes
-    scandelete=android/libs
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.3.0
-Current Version Code:30
--- a/metadata/se.tube42.drum.android.yml
+++ b/metadata/se.tube42.drum.android.yml
@ -0,0 +1,143 @@
+Categories:
+  - Multimedia
+License: GPL-2.0-only
+SourceCode: https://github.com/tube42/drumon
+IssueTracker: https://github.com/tube42/drumon/issues
+
+AutoName: Drum On!
+Summary: Use your smartphone as a virtual drum
+Description: |-
+    Simple and minimalist drum app that can, for example, be used to accompany
+    guitar or bass players.
+
+RepoType: git
+Repo: https://github.com/tube42/drumon.git
+
+Builds:
+  - versionName: 0.1.3
+    versionCode: 13
+    commit: v0.1.3
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.1.4
+    versionCode: 14
+    commit: v0.1.4
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.1.5
+    versionCode: 15
+    commit: v0.1.5
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.1.6
+    versionCode: 16
+    commit: v0.1.6
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.1.7
+    versionCode: 17
+    commit: v0.1.7
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.1.8
+    versionCode: 18
+    commit: v0.1.8
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.1.9
+    versionCode: 19
+    commit: v0.1.9
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.2.0
+    versionCode: 20
+    commit: v0.2.0
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.2.1
+    versionCode: 21
+    commit: v0.2.1
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.2.2
+    versionCode: 22
+    commit: v0.2.2
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.2.3
+    versionCode: 23
+    commit: v0.2.3
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.2.4
+    versionCode: 24
+    commit: v0.2.4
+    submodules: true
+    build: ant setup
+
+  - versionName: 0.2.6
+    versionCode: 26
+    commit: v0.2.6
+    submodules: true
+    gradle:
+      - yes
+    output: android/build/outputs/apk/android-release-unsigned.apk
+    prebuild: sed -i -e 's/\"se.tube42.drumon\"/\"se.tube42.drum.android\"/' android/build.gradle
+    scanignore:
+      - android/libs
+
+  - versionName: 0.2.7
+    versionCode: 27
+    commit: v0.2.7
+    submodules: true
+    gradle:
+      - yes
+    output: android/build/outputs/apk/android-release-unsigned.apk
+    scanignore:
+      - android/libs
+
+  - versionName: 0.2.8
+    versionCode: 28
+    commit: v0.2.8
+    submodules: true
+    gradle:
+      - yes
+    output: android/build/outputs/apk/android-release-unsigned.apk
+    scanignore:
+      - android/libs
+
+  - versionName: 0.2.9
+    versionCode: 29
+    commit: v0.2.9
+    submodules: true
+    gradle:
+      - yes
+    output: android/build/outputs/apk/android-release-unsigned.apk
+    scanignore:
+      - android/libs
+
+  - versionName: 0.3.0
+    versionCode: 30
+    commit: v0.3.0
+    subdir: android
+    submodules: true
+    gradle:
+      - yes
+    scandelete:
+      - android/libs
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.3.0
+CurrentVersionCode: 30
--- a/metadata/se.tube42.kidsmem.android.txt
+++ b/metadata/se.tube42.kidsmem.android.txt
@ -1,53 +0,0 @@
-Categories:Games
-License:GPL-2.0-only
-Web Site:
-Source Code:https://github.com/tube42/candymem
-Issue Tracker:https://github.com/tube42/candymem/issues
-
-Auto Name:Candy Memory
-Summary:Match-two memory game
-Description:
-Candy Memory is a casual "match two" memory game for children and adults. It was
-created during #CANDYJAM, because everybody loves candy (well, maybe not some
-lawyers).
-.
-
-Repo Type:git
-Repo:https://github.com/tube42/candymem
-
-Build:1.2,12
-    disable=binaries
-    commit=5d887616ce4e0e91887a84bf1e822512a34a9029
-    submodules=yes
-    output=bin/candymem-release-unsigned.apk
-    build=ant setup && \
-        ant release
-
-Build:1.4,14
-    commit=v1.4
-    submodules=yes
-    build=ant setup
-
-Build:1.6.0,16
-    commit=v1.6.0
-    subdir=android
-    submodules=yes
-    gradle=yes
-    scandelete=android/libs
-
-Build:1.7.0,17
-    commit=v1.7.0
-    subdir=android
-    submodules=yes
-    gradle=yes
-    scandelete=android/libs
-
-Maintainer Notes:
-libgdx.so and libgdx-freetype.so binaries are extracted from
-com.badlogicgames.gdx:gdx-platform JARs that come from Maven Central.
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.7.0
-Current Version Code:17
--- a/metadata/se.tube42.kidsmem.android.yml
+++ b/metadata/se.tube42.kidsmem.android.yml
@ -0,0 +1,61 @@
+Categories:
+  - Games
+License: GPL-2.0-only
+SourceCode: https://github.com/tube42/candymem
+IssueTracker: https://github.com/tube42/candymem/issues
+
+AutoName: Candy Memory
+Summary: Match-two memory game
+Description: |-
+    Candy Memory is a casual "match two" memory game for children and adults. It was
+    created during #CANDYJAM, because everybody loves candy (well, maybe not some
+    lawyers).
+
+RepoType: git
+Repo: https://github.com/tube42/candymem
+
+Builds:
+  - versionName: '1.2'
+    versionCode: 12
+    disable: binaries
+    commit: 5d887616ce4e0e91887a84bf1e822512a34a9029
+    submodules: true
+    output: bin/candymem-release-unsigned.apk
+    build:
+      - ant setup
+      - ant release
+
+  - versionName: '1.4'
+    versionCode: 14
+    commit: v1.4
+    submodules: true
+    build: ant setup
+
+  - versionName: 1.6.0
+    versionCode: 16
+    commit: v1.6.0
+    subdir: android
+    submodules: true
+    gradle:
+      - yes
+    scandelete:
+      - android/libs
+
+  - versionName: 1.7.0
+    versionCode: 17
+    commit: v1.7.0
+    subdir: android
+    submodules: true
+    gradle:
+      - yes
+    scandelete:
+      - android/libs
+
+MaintainerNotes: |-
+    libgdx.so and libgdx-freetype.so binaries are extracted from
+    com.badlogicgames.gdx:gdx-platform JARs that come from Maven Central.
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.7.0
+CurrentVersionCode: 17
--- a/metadata/se.tube42.p9.android.txt
+++ b/metadata/se.tube42.p9.android.txt
@ -1,66 +0,0 @@
-Categories:Games
-License:GPL-2.0-only
-Web Site:
-Source Code:https://github.com/tube42/9p
-Issue Tracker:https://github.com/tube42/9p/issues
-
-Auto Name:9P
-Summary:Word puzzle game
-Description:
-9P is a 3x3 word puzzle game for Android.
-.
-
-Repo Type:git
-Repo:https://github.com/tube42/9p
-
-Build:0.0.1,1
-    disable=java 1.6/1.7/1.8 issue
-    commit=v0.0.1
-    submodules=yes
-    scanignore=assets/dict/en.bin
-    build=ant setup
-
-Build:0.0.3,3
-    disable=The android command is deprecated
-    commit=v0.0.3
-    subdir=android
-    submodules=yes
-    scanignore=assets/dict/en.bin
-    build=ant setup
-
-Build:0.0.7,7
-    commit=v0.0.7
-    subdir=android
-    submodules=yes
-    gradle=yes
-    rm=android/libs
-    scanignore=android/assets/dict/en.bin,android/libs
-
-Build:0.0.8,8
-    commit=v0.0.8
-    subdir=android
-    submodules=yes
-    gradle=yes
-    rm=android/libs
-    scanignore=android/assets/dict/en.bin,android/libs
-
-Build:0.0.9,9
-    commit=v0.0.9
-    subdir=android
-    submodules=yes
-    gradle=yes
-    rm=android/libs
-    scanignore=android/assets/dict/??.bin,android/libs
-
-Build:0.1.0,10
-    commit=v0.1.0
-    subdir=android
-    submodules=yes
-    gradle=yes
-    rm=android/libs
-    scanignore=android/assets/dict/??.bin,android/libs
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.1.0
-Current Version Code:10
--- a/metadata/se.tube42.p9.android.yml
+++ b/metadata/se.tube42.p9.android.yml
@ -0,0 +1,89 @@
+Categories:
+  - Games
+License: GPL-2.0-only
+SourceCode: https://github.com/tube42/9p
+IssueTracker: https://github.com/tube42/9p/issues
+
+AutoName: 9P
+Summary: Word puzzle game
+Description: 9P is a 3x3 word puzzle game for Android.
+
+RepoType: git
+Repo: https://github.com/tube42/9p
+
+Builds:
+  - versionName: 0.0.1
+    versionCode: 1
+    disable: java 1.6/1.7/1.8 issue
+    commit: v0.0.1
+    submodules: true
+    scanignore:
+      - assets/dict/en.bin
+    build: ant setup
+
+  - versionName: 0.0.3
+    versionCode: 3
+    disable: The android command is deprecated
+    commit: v0.0.3
+    subdir: android
+    submodules: true
+    scanignore:
+      - assets/dict/en.bin
+    build: ant setup
+
+  - versionName: 0.0.7
+    versionCode: 7
+    commit: v0.0.7
+    subdir: android
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - android/libs
+    scanignore:
+      - android/assets/dict/en.bin
+      - android/libs
+
+  - versionName: 0.0.8
+    versionCode: 8
+    commit: v0.0.8
+    subdir: android
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - android/libs
+    scanignore:
+      - android/assets/dict/en.bin
+      - android/libs
+
+  - versionName: 0.0.9
+    versionCode: 9
+    commit: v0.0.9
+    subdir: android
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - android/libs
+    scanignore:
+      - android/assets/dict/??.bin
+      - android/libs
+
+  - versionName: 0.1.0
+    versionCode: 10
+    commit: v0.1.0
+    subdir: android
+    submodules: true
+    gradle:
+      - yes
+    rm:
+      - android/libs
+    scanignore:
+      - android/assets/dict/??.bin
+      - android/libs
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.1.0
+CurrentVersionCode: 10
--- a/metadata/seanfoy.wherering.txt
+++ b/metadata/seanfoy.wherering.txt
@ -1,30 +0,0 @@
-Categories:Navigation
-License:GPL-3.0-only
-Web Site:https://code.google.com/p/wherering
-Source Code:https://code.google.com/p/wherering/source
-Issue Tracker:
-
-Summary:Change ring mode by location
-Description:
-Have the phone's ring mode (silent, vibrate, etc) change when you enter a set
-location zone, configurable by radius. It uses GPS sparingly to save the
-battery.
-.
-
-Repo Type:hg
-Repo:https://code.google.com/p/wherering
-
-Build:1.99.0,99
-    commit=ced797
-    subdir=WhereRing
-    init=mv AndroidManifest.xml.tmpl AndroidManifest.xml
-    forceversion=yes
-    forcevercode=yes
-    prebuild=sed -i 's/%s (%s)/(%s)/g' res/values/strings.xml && \
-        rm -rf ../WhereRingTest ant-support
-    target=android-7
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.99.0
-Current Version Code:99
--- a/metadata/seanfoy.wherering.yml
+++ b/metadata/seanfoy.wherering.yml
@ -0,0 +1,32 @@
+Categories:
+  - Navigation
+License: GPL-3.0-only
+WebSite: https://code.google.com/p/wherering
+SourceCode: https://code.google.com/p/wherering/source
+
+Summary: Change ring mode by location
+Description: |-
+    Have the phone's ring mode (silent, vibrate, etc) change when you enter a set
+    location zone, configurable by radius. It uses GPS sparingly to save the
+    battery.
+
+RepoType: hg
+Repo: https://code.google.com/p/wherering
+
+Builds:
+  - versionName: 1.99.0
+    versionCode: 99
+    commit: ced797
+    subdir: WhereRing
+    init: mv AndroidManifest.xml.tmpl AndroidManifest.xml
+    forceversion: true
+    forcevercode: true
+    prebuild:
+      - sed -i 's/%s (%s)/(%s)/g' res/values/strings.xml
+      - rm -rf ../WhereRingTest ant-support
+    target: android-7
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 1.99.0
+CurrentVersionCode: 99
--- a/metadata/security.pEp.txt
+++ b/metadata/security.pEp.txt
@ -1,102 +0,0 @@
-Categories:Security,Internet
-License:GPL-3.0-only
-Web Site:https://www.pep.security/
-Source Code:https://download.pep.security/gitlist
-Issue Tracker:https://gitlab.com/pep.security/fdroiddata/issues
-Changelog:https://www.pep.security/docs/release_notes_android.html
-
-Auto Name:p≡p
-Summary:Read and write encrypted e-mails
-Description:
-p≡p is a cyber security solution which protects the confidentiality and
-reliability of communications for citizens, for public offices and for
-enterprises. It provides end-to-end cryptography in all common crypto-standards
-through the app that you install on your phone.
-
-p≡p for Android makes e-mail encryption easy on mobile devices for everyone by
-automatic and seamless integration of end-to-end encryption. Set it up with your
-existing e-mail address under a minute. Send and receive as many messages as you
-want without any restrictions on the number of devices the p≡p app runs on.
-
-p≡p supports the user with advanced automation and is fully compatible with
-OpenPGP
-
-* it will automatically encrypt your e-mail and attachments, including pictures
-* it can ensure no one can intercept your perfectly encrypted e-mail
-* it is peer-to-peer and uses no central service
-* it works with all your existing e-mail account(s)
-* it can authenticate your communication partner and prevent identity theft
-* it offers security and privacy by default
-
-p≡p is end-to-end and supports all commonly used Android devices.
-
-p≡p is easy for your recipients too – depending on their security capabilities,
-they can exchange encrypted messages with you.
-
-With p≡p, you don’t need a separate account, you can send secure messages to
-anyone anywhere, regardless of their email provider.
-
-Just install the app and you can communicate in confidence with your peers.
-.
-
-Repo Type:git
-Repo:https://letsencrypt.pep-security.lu/gitlab/android/pep.git
-
-Build:1.0.101rc1.withoutKeysync,2
-    commit=v1.0.101rc1
-    subdir=k9mail
-    gradle=WithoutkeysyncPlayStore
-    srclibs=pEpJNIAdapter@6d3137dd82e7,pEpEngine@6d083c04dd77,yml2@2.5.5
-    prebuild=rm -vf src/main/res/xml/changelog_master.xml && \
-        sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \
-        sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf && \
-        sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \
-        sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \
-        sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \
-        sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:' $$pEpEngine$$/Makefile.conf && \
-        sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \
-        sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
-    ndk=r14b
-
-Build:1.0.209.withoutKeysync,19
-    commit=v1.0.209
-    subdir=k9mail
-    gradle=WithoutkeysyncPlayStore
-    srclibs=pEpJNIAdapter@8973dc37e39d,pEpEngine@601cdaeef663,yml2@2.5.7
-    prebuild=rm -vf src/main/res/xml/changelog_master.xml && \
-        sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \
-        sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf && \
-        sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \
-        sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \
-        sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \
-        sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:' $$pEpEngine$$/Makefile.conf && \
-        sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \
-        sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
-    ndk=r14b
-
-Build:1.0.213.withoutKeysync,23
-    commit=v1.0.213
-    subdir=k9mail
-    gradle=WithoutkeysyncPlayStore
-    srclibs=pEpJNIAdapter@441,pEpEngine@3104,yml2@2.5.8
-    prebuild=pwd && \
-        $$pEpJNIAdapter$$/android/external/generate-standalone-ndk-toolchain.sh && \
-        rm -rvf /tmp/ndk-18-arm && \
-        mv ndk-18-arm /tmp && \
-        ln -s /tmp/ndk-18-arm $$pEpJNIAdapter$$/android/external/ndk-18-arm && \
-        rm -vf src/main/res/xml/changelog_master.xml && \
-        sed -i 's:docs.patch:docs.patch\n\tsed -i "s\:src doc tests\:src\:\" libgcrypt/Makefile.am:' $$pEpJNIAdapter$$/android/external/Makefile && \
-        sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \
-        sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf && \
-        sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \
-        sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \
-        sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \
-        sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:' $$pEpEngine$$/Makefile.conf && \
-        sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \
-        sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
-    ndk=r18b
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:1.0.213
-Current Version Code:23
--- a/metadata/security.pEp.yml
+++ b/metadata/security.pEp.yml
@ -0,0 +1,132 @@
+Categories:
+  - Security
+  - Internet
+License: GPL-3.0-only
+WebSite: https://www.pep.security/
+SourceCode: https://download.pep.security/gitlist
+IssueTracker: https://gitlab.com/pep.security/fdroiddata/issues
+Changelog: https://www.pep.security/docs/release_notes_android.html
+
+AutoName: p≡p
+Summary: Read and write encrypted e-mails
+Description: |-
+    p≡p is a cyber security solution which protects the confidentiality and
+    reliability of communications for citizens, for public offices and for
+    enterprises. It provides end-to-end cryptography in all common crypto-standards
+    through the app that you install on your phone.
+
+    p≡p for Android makes e-mail encryption easy on mobile devices for everyone by
+    automatic and seamless integration of end-to-end encryption. Set it up with your
+    existing e-mail address under a minute. Send and receive as many messages as you
+    want without any restrictions on the number of devices the p≡p app runs on.
+
+    p≡p supports the user with advanced automation and is fully compatible with
+    OpenPGP
+
+    * it will automatically encrypt your e-mail and attachments, including pictures
+    * it can ensure no one can intercept your perfectly encrypted e-mail
+    * it is peer-to-peer and uses no central service
+    * it works with all your existing e-mail account(s)
+    * it can authenticate your communication partner and prevent identity theft
+    * it offers security and privacy by default
+
+    p≡p is end-to-end and supports all commonly used Android devices.
+
+    p≡p is easy for your recipients too – depending on their security capabilities,
+    they can exchange encrypted messages with you.
+
+    With p≡p, you don’t need a separate account, you can send secure messages to
+    anyone anywhere, regardless of their email provider.
+
+    Just install the app and you can communicate in confidence with your peers.
+
+RepoType: git
+Repo: https://letsencrypt.pep-security.lu/gitlab/android/pep.git
+
+Builds:
+  - versionName: 1.0.101rc1.withoutKeysync
+    versionCode: 2
+    commit: v1.0.101rc1
+    subdir: k9mail
+    gradle:
+      - WithoutkeysyncPlayStore
+    srclibs:
+      - pEpJNIAdapter@6d3137dd82e7
+      - pEpEngine@6d083c04dd77
+      - yml2@2.5.5
+    prebuild:
+      - rm -vf src/main/res/xml/changelog_master.xml
+      - sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):'
+        ../settings.gradle
+      - sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf
+      - sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile
+      - sed -i 's:env python:env python2:' $$yml2$$/yml2proc
+      - sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath
+        $$yml2$$)']):" $$yml2$$/yml2proc
+      - sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:'
+        $$pEpEngine$$/Makefile.conf
+      - sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf
+      - sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
+    ndk: r14b
+
+  - versionName: 1.0.209.withoutKeysync
+    versionCode: 19
+    commit: v1.0.209
+    subdir: k9mail
+    gradle:
+      - WithoutkeysyncPlayStore
+    srclibs:
+      - pEpJNIAdapter@8973dc37e39d
+      - pEpEngine@601cdaeef663
+      - yml2@2.5.7
+    prebuild:
+      - rm -vf src/main/res/xml/changelog_master.xml
+      - sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):'
+        ../settings.gradle
+      - sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf
+      - sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile
+      - sed -i 's:env python:env python2:' $$yml2$$/yml2proc
+      - sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath
+        $$yml2$$)']):" $$yml2$$/yml2proc
+      - sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:'
+        $$pEpEngine$$/Makefile.conf
+      - sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf
+      - sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
+    ndk: r14b
+
+  - versionName: 1.0.213.withoutKeysync
+    versionCode: 23
+    commit: v1.0.213
+    subdir: k9mail
+    gradle:
+      - WithoutkeysyncPlayStore
+    srclibs:
+      - pEpJNIAdapter@441
+      - pEpEngine@3104
+      - yml2@2.5.8
+    prebuild:
+      - pwd
+      - $$pEpJNIAdapter$$/android/external/generate-standalone-ndk-toolchain.sh
+      - rm -rvf /tmp/ndk-18-arm
+      - mv ndk-18-arm /tmp
+      - ln -s /tmp/ndk-18-arm $$pEpJNIAdapter$$/android/external/ndk-18-arm
+      - rm -vf src/main/res/xml/changelog_master.xml
+      - sed -i 's:docs.patch:docs.patch\n\tsed -i "s\:src doc tests\:src\:\" libgcrypt/Makefile.am:'
+        $$pEpJNIAdapter$$/android/external/Makefile
+      - sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):'
+        ../settings.gradle
+      - sed -i 's:YML2_PATH=.*$:YML2_PATH=../$$yml2$$:' $$pEpEngine$$/default.conf
+      - sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile
+      - sed -i 's:env python:env python2:' $$yml2$$/yml2proc
+      - sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath
+        $$yml2$$)']):" $$yml2$$/yml2proc
+      - sed -i 's:YML2PROC=.*$:YML2PROC=../$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=../$$yml2$$:'
+        $$pEpEngine$$/Makefile.conf
+      - sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf
+      - sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
+    ndk: r18b
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: 1.0.213
+CurrentVersionCode: 23
--- a/metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.txt
+++ b/metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.txt
@ -1,231 +0,0 @@
-Categories:Time,Sports & Health
-License:GPL-3.0-only
-Web Site:https://rocketnine.space
-Source Code:https://gitlab.com/tslocum/meditationassistant
-Issue Tracker:https://gitlab.com/tslocum/meditationassistant/issues
-Changelog:https://gitlab.com/tslocum/meditationassistant/blob/HEAD/CHANGELOG
-Donate:https://rocketnine.space/donate/
-LiberapayID:968545
-
-Auto Name:Meditation Assistant Free
-Summary:Feature packed meditation session timer and recorder
-Description:
-This application assists with both timed (via duration or ending at a specific
-time) and untimed sessions, with numerous customizations, including
-start/interval/end sounds and device behavior. It also provides a monthly
-overview of your progress.
-
-A major feature in this application is the ability to share your sessions
-online. Though entirely optional, sharing your progress online adds another
-dimension to your accountability. Now that you've gone public, as your
-meditation streak increases more users will see it as a goal of their own. One
-user has posted over 500 days of consecutive days of meditation.
-
-Your meditation streak is the number of consecutive days you have recorded at
-least one session. As your streak grows, "not breaking the chain" becomes quite
-important. Soon you will be meditating once a day, even if it's five or ten
-minutes out of your schedule.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/tslocum/meditationassistant
-
-Build:1.2.7,127
-    disable=aidl missing
-    commit=1.2.7
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.2.8,128
-    commit=1.2.8
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.2.9,129
-    commit=1.2.9
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.0,130
-    commit=1.3.0
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.1,131
-    commit=1.3.1
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.2,132
-    commit=1.3.2
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.3,133
-    commit=1.3.3
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.4,134
-    commit=1.3.4
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.5,135
-    commit=1.3.5
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.6,136
-    commit=1.3.6
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.7,137
-    commit=1.3.7
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.8,138
-    commit=1.3.8
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.3.9,139
-    commit=1.3.9
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.4.0,140
-    commit=1.4.0
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.4.1,141
-    disable=Cannot resolve external dependency com.android.tools.build:gradle:2.3.3 because no repositories are defined
-    commit=1.4.1
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.4.2,142
-    commit=1.4.2
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.4.3,143
-    commit=1.4.3
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.4.5,145
-    commit=1.4.5
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.4.7,147
-    commit=1.4.7
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.4.9,149
-    commit=1.4.9
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.5.0,150
-    commit=1.5.0
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.5.1,151
-    commit=1.5.1
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.5.2,152
-    commit=1.5.2
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Build:1.5.3,153
-    commit=1.5.3
-    subdir=MeditationAssistant
-    gradle=opensource
-    rm=MeditationAssistantWear
-    prebuild=sed -i -e '/play-services/d' build.gradle && \
-        sed -i 's/4096m/1024m/' ../gradle.properties
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Update Check Name:sh.ftp.rocketninelabs.meditationassistant
-Current Version:1.5.3
-Current Version Code:153
--- a/metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.yml
+++ b/metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.yml
@ -0,0 +1,345 @@
+Categories:
+  - Time
+  - Sports & Health
+License: GPL-3.0-only
+WebSite: https://rocketnine.space
+SourceCode: https://gitlab.com/tslocum/meditationassistant
+IssueTracker: https://gitlab.com/tslocum/meditationassistant/issues
+Changelog: https://gitlab.com/tslocum/meditationassistant/blob/HEAD/CHANGELOG
+Donate: https://rocketnine.space/donate/
+LiberapayID: '968545'
+
+AutoName: Meditation Assistant Free
+Summary: Feature packed meditation session timer and recorder
+Description: |-
+    This application assists with both timed (via duration or ending at a specific
+    time) and untimed sessions, with numerous customizations, including
+    start/interval/end sounds and device behavior. It also provides a monthly
+    overview of your progress.
+
+    A major feature in this application is the ability to share your sessions
+    online. Though entirely optional, sharing your progress online adds another
+    dimension to your accountability. Now that you've gone public, as your
+    meditation streak increases more users will see it as a goal of their own. One
+    user has posted over 500 days of consecutive days of meditation.
+
+    Your meditation streak is the number of consecutive days you have recorded at
+    least one session. As your streak grows, "not breaking the chain" becomes quite
+    important. Soon you will be meditating once a day, even if it's five or ten
+    minutes out of your schedule.
+
+RepoType: git
+Repo: https://gitlab.com/tslocum/meditationassistant
+
+Builds:
+  - versionName: 1.2.7
+    versionCode: 127
+    disable: aidl missing
+    commit: 1.2.7
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.2.8
+    versionCode: 128
+    commit: 1.2.8
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.2.9
+    versionCode: 129
+    commit: 1.2.9
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.0
+    versionCode: 130
+    commit: 1.3.0
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.1
+    versionCode: 131
+    commit: 1.3.1
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.2
+    versionCode: 132
+    commit: 1.3.2
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.3
+    versionCode: 133
+    commit: 1.3.3
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.4
+    versionCode: 134
+    commit: 1.3.4
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.5
+    versionCode: 135
+    commit: 1.3.5
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.6
+    versionCode: 136
+    commit: 1.3.6
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.7
+    versionCode: 137
+    commit: 1.3.7
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.8
+    versionCode: 138
+    commit: 1.3.8
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.3.9
+    versionCode: 139
+    commit: 1.3.9
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.4.0
+    versionCode: 140
+    commit: 1.4.0
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.4.1
+    versionCode: 141
+    disable: Cannot resolve external dependency com.android.tools.build:gradle:2.3.3
+        because no repositories are defined
+    commit: 1.4.1
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' -e '/applicationVariants.all/i/*' -e '/sourceSets/i*/'
+        build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.4.2
+    versionCode: 142
+    commit: 1.4.2
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.4.3
+    versionCode: 143
+    commit: 1.4.3
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.4.5
+    versionCode: 145
+    commit: 1.4.5
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.4.7
+    versionCode: 147
+    commit: 1.4.7
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.4.9
+    versionCode: 149
+    commit: 1.4.9
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.5.0
+    versionCode: 150
+    commit: 1.5.0
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.5.1
+    versionCode: 151
+    commit: 1.5.1
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.5.2
+    versionCode: 152
+    commit: 1.5.2
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+  - versionName: 1.5.3
+    versionCode: 153
+    commit: 1.5.3
+    subdir: MeditationAssistant
+    gradle:
+      - opensource
+    rm:
+      - MeditationAssistantWear
+    prebuild:
+      - sed -i -e '/play-services/d' build.gradle
+      - sed -i 's/4096m/1024m/' ../gradle.properties
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+UpdateCheckName: sh.ftp.rocketninelabs.meditationassistant
+CurrentVersion: 1.5.3
+CurrentVersionCode: 153
--- a/metadata/si.modrajagoda.didi.txt
+++ b/metadata/si.modrajagoda.didi.txt
@ -1,30 +0,0 @@
-Categories:Writing
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/blaztriglav/did-i
-Issue Tracker:https://github.com/blaztriglav/did-i/issues
-Bitcoin:1FU27EyocpFFhexjoakSe7Hxvf4jD2KmFh
-
-Auto Name:Did I?
-Summary:Recurring todo list
-Description:
-Did I? is a habit tracking app which asks you a simple question about your habit
-every day: "Did I?"
-
-Enter the habits you want to build, and what time of day you want the app to ask
-you about them, and that's that.
-
-Status: Beta
-.
-
-Repo Type:git
-Repo:https://github.com/blaztriglav/did-i.git
-
-Build:1.0,1
-    commit=193a3f47d0
-    subdir=Did I
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0
-Current Version Code:1
--- a/metadata/si.modrajagoda.didi.yml
+++ b/metadata/si.modrajagoda.didi.yml
@ -0,0 +1,31 @@
+Categories:
+  - Writing
+License: Apache-2.0
+SourceCode: https://github.com/blaztriglav/did-i
+IssueTracker: https://github.com/blaztriglav/did-i/issues
+Bitcoin: 1FU27EyocpFFhexjoakSe7Hxvf4jD2KmFh
+
+AutoName: Did I?
+Summary: Recurring todo list
+Description: |-
+    Did I? is a habit tracking app which asks you a simple question about your habit
+    every day: "Did I?"
+
+    Enter the habits you want to build, and what time of day you want the app to ask
+    you about them, and that's that.
+
+    Status: Beta
+
+RepoType: git
+Repo: https://github.com/blaztriglav/did-i.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 193a3f47d0
+    subdir: Did I
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
--- a/metadata/siir.es.adbWireless.txt
+++ b/metadata/siir.es.adbWireless.txt
@ -1,37 +0,0 @@
-Categories:Connectivity
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/slightlywobbly/adbwireless
-Issue Tracker:
-Changelog:https://github.com/slightlywobbly/adbwireless#versions
-
-Auto Name:adbWireless
-Summary:Wireless adb
-Description:
-adbWireless lets you access your phone through adb without the need of a wired
-USB connection. The app provides you with the phone's local IP address so that
-you can use it on your computer to connect to it. Beware, the access will be
-granted to all devices on the same wireless network - it would not be sensible
-to activate this service on any network that is not of your best trust.
-
-A simple toggle widget is included.
-
-Requires Root: Yes.
-
-Status: Original source code repo vanished
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/slightlywobbly/adbwireless
-
-Build:1.5.4,12
-    commit=3f2d7c7cf73ebfe71299a84
-    init=rm -rf libs/android-support-v4.jar release .settings zwork server
-    extlibs=android/android-support-v4.jar
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.5.4
-Current Version Code:12
--- a/metadata/siir.es.adbWireless.yml
+++ b/metadata/siir.es.adbWireless.yml
@ -0,0 +1,38 @@
+Categories:
+  - Connectivity
+License: GPL-3.0-or-later
+SourceCode: https://github.com/slightlywobbly/adbwireless
+Changelog: https://github.com/slightlywobbly/adbwireless#versions
+
+AutoName: adbWireless
+Summary: Wireless adb
+Description: |-
+    adbWireless lets you access your phone through adb without the need of a wired
+    USB connection. The app provides you with the phone's local IP address so that
+    you can use it on your computer to connect to it. Beware, the access will be
+    granted to all devices on the same wireless network - it would not be sensible
+    to activate this service on any network that is not of your best trust.
+
+    A simple toggle widget is included.
+
+    Requires Root: Yes.
+
+    Status: Original source code repo vanished
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/slightlywobbly/adbwireless
+
+Builds:
+  - versionName: 1.5.4
+    versionCode: 12
+    commit: 3f2d7c7cf73ebfe71299a84
+    init: rm -rf libs/android-support-v4.jar release .settings zwork server
+    extlibs:
+      - android/android-support-v4.jar
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 1.5.4
+CurrentVersionCode: 12
--- a/metadata/simple.reboot.com.txt
+++ b/metadata/simple.reboot.com.txt
@ -1,58 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/franciscofranco/Simple-Reboot-app
-Issue Tracker:https://github.com/franciscofranco/Simple-Reboot-app/issues
-
-Auto Name:Simple Reboot
-Summary:Reboot your device
-Description:
-Choose from reboot, soft reboot, or safe mode options.
-
-Requires root: Yes.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/franciscofranco/Simple-Reboot-app
-
-Build:4p11,11
-    commit=cc232f89de13cec2f7425d942c0fb2bdb6a7c876
-    subdir=app
-    gradle=yes
-    rm=app/libs/libsuperuser/build
-
-Build:7.0,12
-    disable=doesnt build, forcevercode seems to be broken
-    commit=e707a11490ca0f5a81675069b688765ab270648c
-    subdir=app
-    gradle=yes
-    forcevercode=yes
-    prebuild=sed -i -e '/java.home/d' ../gradle.properties
-
-Build:7.0,13
-    commit=e707a11490ca0f5a81675069b688765ab270648c
-    subdir=app
-    gradle=yes
-    forcevercode=yes
-    prebuild=sed -i -e '/java.home/d' ../gradle.properties && \
-        sed -i -e '/versionCode /s/getVersionCodeTimestamp()/$$VERCODE$$/g' build.gradle
-
-Build:7.0.1,14
-    commit=f7a7bfc05e997a29ffe0f69e8e315b301bb6732b
-    subdir=app
-    gradle=yes
-    forcevercode=yes
-    prebuild=sed -i -e '/java.home/d' ../gradle.properties && \
-        sed -i -e 's/-beta3//g' -e '/versionCode /s/getVersionCodeTimestamp()/$$VERCODE$$/g' build.gradle ../build.gradle
-
-Maintainer Notes:
-Upstream now uses time-based version codes generated at build-time. Both would
-break UCM on its own, so set this to static for now.
-.
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:7.0.1
-Current Version Code:14
--- a/metadata/simple.reboot.com.yml
+++ b/metadata/simple.reboot.com.yml
@ -0,0 +1,69 @@
+Categories:
+  - System
+License: Apache-2.0
+SourceCode: https://github.com/franciscofranco/Simple-Reboot-app
+IssueTracker: https://github.com/franciscofranco/Simple-Reboot-app/issues
+
+AutoName: Simple Reboot
+Summary: Reboot your device
+Description: |-
+    Choose from reboot, soft reboot, or safe mode options.
+
+    Requires root: Yes.
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/franciscofranco/Simple-Reboot-app
+
+Builds:
+  - versionName: 4p11
+    versionCode: 11
+    commit: cc232f89de13cec2f7425d942c0fb2bdb6a7c876
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/libsuperuser/build
+
+  - versionName: '7.0'
+    versionCode: 12
+    disable: doesnt build, forcevercode seems to be broken
+    commit: e707a11490ca0f5a81675069b688765ab270648c
+    subdir: app
+    gradle:
+      - yes
+    forcevercode: true
+    prebuild: sed -i -e '/java.home/d' ../gradle.properties
+
+  - versionName: '7.0'
+    versionCode: 13
+    commit: e707a11490ca0f5a81675069b688765ab270648c
+    subdir: app
+    gradle:
+      - yes
+    forcevercode: true
+    prebuild:
+      - sed -i -e '/java.home/d' ../gradle.properties
+      - sed -i -e '/versionCode /s/getVersionCodeTimestamp()/$$VERCODE$$/g' build.gradle
+
+  - versionName: 7.0.1
+    versionCode: 14
+    commit: f7a7bfc05e997a29ffe0f69e8e315b301bb6732b
+    subdir: app
+    gradle:
+      - yes
+    forcevercode: true
+    prebuild:
+      - sed -i -e '/java.home/d' ../gradle.properties
+      - sed -i -e 's/-beta3//g' -e '/versionCode /s/getVersionCodeTimestamp()/$$VERCODE$$/g'
+        build.gradle ../build.gradle
+
+MaintainerNotes: |-
+    Upstream now uses time-based version codes generated at build-time. Both would
+    break UCM on its own, so set this to static for now.
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 7.0.1
+CurrentVersionCode: 14
--- a/metadata/sites.mjwhitta.scripter.txt
+++ b/metadata/sites.mjwhitta.scripter.txt
@ -1,36 +0,0 @@
-Categories:Development
-License:GPL-3.0-only
-Web Site:
-Source Code:https://code.launchpad.net/~mjwhitta/+junk/Scripter
-Issue Tracker:https://bugs.launchpad.net/~mjwhitta
-
-Auto Name:$cripter
-Summary:Run scripts on your device
-Description:
-This simple app lets you write and run scripts from your device.
-.
-
-Repo Type:bzr
-Repo:lp:~mjwhitta/+junk/Scripter
-
-Build:2.2,13
-    disable=needs root for what? if so explanations needed at 6
-    commit=6
-    srclibs=ActionBarSherlock@4.2.0,Andlib-mjwhitta@4
-    extlibs=android/android-support-v4.jar
-    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-        cp libs/android-support-v4.jar $$Andlib-mjwhitta$$/libs/ && \
-        sed -i 's@.*reference.*ActionBarSherlock.*@android.library.reference.1=../$$ActionBarSherlock$$@' $$Andlib-mjwhitta$$/project.properties && \
-        $$SDK$$/tools/android update project -p $$Andlib-mjwhitta$$ && \
-        rm project.properties && \
-        echo "target=android-17" > project.properties && \
-        echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-        echo "android.library.reference.2=$$Andlib-mjwhitta$$" >> project.properties
-
-Build:2.3,14
-    disable=needs root for what? if so explanations needed at 6
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.3
-Current Version Code:14
--- a/metadata/sk.baka.aedict.txt
+++ b/metadata/sk.baka.aedict.txt
@ -1,24 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/mvysny/aedict
-Issue Tracker:https://github.com/mvysny/aedict/issues
-Bitcoin:1KJyEutxrm3yL7chvsciMJTvXahXoWE3Pw
-
-Summary:English-Japanese dictionary
-Description:
-A free, open-source english-japanese dictionary for Android which uses Jim
-Breen's edict data. Does not require japanese keyboard. Works offline. The
-dictionary data is downloaded automatically.
-.
-
-Repo Type:git
-Repo:https://github.com/mvysny/aedict
-
-Build:2.8,280
-    disable=Build fails (at aedict-2.8)
-    commit=aedict-2.8
-    maven=2
-
-Auto Update Mode:None
-Update Check Mode:Static
--- a/metadata/sk.baka.aedict.yml
+++ b/metadata/sk.baka.aedict.yml
@ -0,0 +1,25 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+SourceCode: https://github.com/mvysny/aedict
+IssueTracker: https://github.com/mvysny/aedict/issues
+Bitcoin: 1KJyEutxrm3yL7chvsciMJTvXahXoWE3Pw
+
+Summary: English-Japanese dictionary
+Description: |-
+    A free, open-source english-japanese dictionary for Android which uses Jim
+    Breen's edict data. Does not require japanese keyboard. Works offline. The
+    dictionary data is downloaded automatically.
+
+RepoType: git
+Repo: https://github.com/mvysny/aedict
+
+Builds:
+  - versionName: '2.8'
+    versionCode: 280
+    disable: Build fails (at aedict-2.8)
+    commit: aedict-2.8
+    maven: '2'
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
--- a/metadata/sk.halmi.fbeditplus.txt
+++ b/metadata/sk.halmi.fbeditplus.txt
@ -1,23 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/videogameboy76/FBEditPlus
-Issue Tracker:https://github.com/videogameboy76/FBEditPlus/issues
-
-Auto Name:Frozen Bubble LevelEditor plus
-Summary:Edit and load custom level packs for FrozenBubble
-Description:
-Edit and load custom level packs for [[org.jfedor.frozenbubble]]. Up-/ and
-downloading is currently broken due to a developer change.
-.
-
-Repo Type:git
-Repo:https://github.com/videogameboy76/FBEditPlus
-
-Build:1.5.0,13
-    commit=adaa72ec4753aa75304dfce1441d97365d3e90a6
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.5.0
-Current Version Code:13
--- a/metadata/sk.halmi.fbeditplus.yml
+++ b/metadata/sk.halmi.fbeditplus.yml
@ -0,0 +1,24 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://github.com/videogameboy76/FBEditPlus
+IssueTracker: https://github.com/videogameboy76/FBEditPlus/issues
+
+AutoName: Frozen Bubble LevelEditor plus
+Summary: Edit and load custom level packs for FrozenBubble
+Description: |-
+    Edit and load custom level packs for [[org.jfedor.frozenbubble]]. Up-/ and
+    downloading is currently broken due to a developer change.
+
+RepoType: git
+Repo: https://github.com/videogameboy76/FBEditPlus
+
+Builds:
+  - versionName: 1.5.0
+    versionCode: 13
+    commit: adaa72ec4753aa75304dfce1441d97365d3e90a6
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.5.0
+CurrentVersionCode: 13
--- a/metadata/sk.madzik.android.logcatudp.txt
+++ b/metadata/sk.madzik.android.logcatudp.txt
@ -1,34 +0,0 @@
-Categories:Connectivity
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/Chemik/logcatudp
-Issue Tracker:https://github.com/Chemik/logcatudp/issues
-
-Auto Name:Logcat to UDP
-Summary:Wireless logging
-Description:
-N.B. This probably won't work on Android 4.1+.
-
-Simple tool for android development that sends a log to UDP port or share it via
-email, bluetooth, etc. Background service is collecting logs and sending them to
-destination IP and UDP port. You can send logs to desktop computer through home
-wifi network, or to server with public IP or cname.
-
-To listen logs use this python script:
-[https://github.com/Chemik/logcatudp/blob/master/test/listener.py]
-
-Example: ./listener.py 192.168.1.10 10009
-
-You can also use your desktop syslog server to receive logs.
-.
-
-Repo Type:git
-Repo:https://github.com/Chemik/logcatudp
-
-Build:0.5,5
-    commit=567a570bfa74f3d3a
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.5
-Current Version Code:5
--- a/metadata/sk.madzik.android.logcatudp.yml
+++ b/metadata/sk.madzik.android.logcatudp.yml
@ -0,0 +1,35 @@
+Categories:
+  - Connectivity
+License: Apache-2.0
+SourceCode: https://github.com/Chemik/logcatudp
+IssueTracker: https://github.com/Chemik/logcatudp/issues
+
+AutoName: Logcat to UDP
+Summary: Wireless logging
+Description: |-
+    N.B. This probably won't work on Android 4.1+.
+
+    Simple tool for android development that sends a log to UDP port or share it via
+    email, bluetooth, etc. Background service is collecting logs and sending them to
+    destination IP and UDP port. You can send logs to desktop computer through home
+    wifi network, or to server with public IP or cname.
+
+    To listen logs use this python script:
+    [https://github.com/Chemik/logcatudp/blob/master/test/listener.py]
+
+    Example: ./listener.py 192.168.1.10 10009
+
+    You can also use your desktop syslog server to receive logs.
+
+RepoType: git
+Repo: https://github.com/Chemik/logcatudp
+
+Builds:
+  - versionName: '0.5'
+    versionCode: 5
+    commit: 567a570bfa74f3d3a
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '0.5'
+CurrentVersionCode: 5
--- a/metadata/sk.vx.connectbot.txt
+++ b/metadata/sk.vx.connectbot.txt
@ -1,56 +0,0 @@
-Categories:Internet
-License:Apache-2.0
-Web Site:http://connectbot.vx.sk
-Source Code:https://github.com/vx/connectbot
-Issue Tracker:https://github.com/vx/connectbot/issues
-
-Auto Name:VX ConnectBot
-Summary:SSH (remote access) client
-Description:
-Based on [[org.connectbot]] and other projects. Additional features:
-
-* background file transfer (SCP protocol)
-* character picker dialog (on-screen button and hardware SYM key)
-* single line input (on-screen button)
-* tap and hold menu (switch to fullscreen mode, change font size)
-* save SSH keys as files
-* save console screenshots (PNG format)
-* new key mappings (hardware keyboard)
-* additional customizations for some phones with hardware keyboards
-
-[[org.pocketworkstation.pckeyboard]], [[com.anysoftkeyboard.languagepack.SSH]]
-and the Android PC-keyboard-layout in Android 4.1 are well suited to terminal
-work.
-.
-
-Repo Type:git
-Repo:https://github.com/vx/connectbot.git
-
-Build:1.7.1-21,21
-    commit=cbe0ea23f1
-    target=android-15
-    buildjni=yes
-
-Build:1.7.1-27,27
-    commit=8c10defa8e
-    init=rm -f build.xml
-    buildjni=yes
-
-Build:1.7.1-29,29
-    commit=c555108dfd
-    init=rm -f build.xml
-    buildjni=yes
-
-Build:1.7.1-30-git,30
-    commit=5f70cc011cd131acb5cd29783fa6744059841aee
-    init=rm -f build.xml
-    forceversion=yes
-    forcevercode=yes
-    rm=libs/x86/libcom_google_ase_Exec.so,libs/armeabi/libcom_google_ase_Exec.so
-    prebuild=sed -i -e '121,122d' res/values-hu/strings.xml
-    buildjni=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest/stable
-Current Version:1.7.1-29
-Current Version Code:29
--- a/metadata/sk.vx.connectbot.yml
+++ b/metadata/sk.vx.connectbot.yml
@ -0,0 +1,67 @@
+Categories:
+  - Internet
+License: Apache-2.0
+WebSite: http://connectbot.vx.sk
+SourceCode: https://github.com/vx/connectbot
+IssueTracker: https://github.com/vx/connectbot/issues
+
+AutoName: VX ConnectBot
+Summary: SSH (remote access) client
+Description: |-
+    Based on [[org.connectbot]] and other projects. Additional features:
+
+    * background file transfer (SCP protocol)
+    * character picker dialog (on-screen button and hardware SYM key)
+    * single line input (on-screen button)
+    * tap and hold menu (switch to fullscreen mode, change font size)
+    * save SSH keys as files
+    * save console screenshots (PNG format)
+    * new key mappings (hardware keyboard)
+    * additional customizations for some phones with hardware keyboards
+
+    [[org.pocketworkstation.pckeyboard]], [[com.anysoftkeyboard.languagepack.SSH]]
+    and the Android PC-keyboard-layout in Android 4.1 are well suited to terminal
+    work.
+
+RepoType: git
+Repo: https://github.com/vx/connectbot.git
+
+Builds:
+  - versionName: 1.7.1-21
+    versionCode: 21
+    commit: cbe0ea23f1
+    target: android-15
+    buildjni:
+      - yes
+
+  - versionName: 1.7.1-27
+    versionCode: 27
+    commit: 8c10defa8e
+    init: rm -f build.xml
+    buildjni:
+      - yes
+
+  - versionName: 1.7.1-29
+    versionCode: 29
+    commit: c555108dfd
+    init: rm -f build.xml
+    buildjni:
+      - yes
+
+  - versionName: 1.7.1-30-git
+    versionCode: 30
+    commit: 5f70cc011cd131acb5cd29783fa6744059841aee
+    init: rm -f build.xml
+    forceversion: true
+    forcevercode: true
+    rm:
+      - libs/x86/libcom_google_ase_Exec.so
+      - libs/armeabi/libcom_google_ase_Exec.so
+    prebuild: sed -i -e '121,122d' res/values-hu/strings.xml
+    buildjni:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest/stable
+CurrentVersion: 1.7.1-29
+CurrentVersionCode: 29
--- a/metadata/sonoroxadc.garethmurfin.co.uk.txt
+++ b/metadata/sonoroxadc.garethmurfin.co.uk.txt
@ -1,26 +0,0 @@
-Categories:Multimedia
-License:GPL-2.0-or-later
-Web Site:http://www.radiantsilverlabs.com/gaz
-Source Code:https://github.com/amiga/sonorox
-Issue Tracker:https://github.com/amiga/sonorox/issues
-
-Auto Name:Sonorox
-Summary:Compose quick beats and loops
-Description:
-It was inspired by the Yamaha Tenori-on and was a finalist in the Android
-Developer Challenge 2 in 2009. Sonorox allows to compose short loops, and to
-upload them to the Sonorox community website. You can also download other
-peoples’ tunes and vote for them. The volume is determined by “Media Volume”.
-.
-
-Repo Type:git
-Repo:https://github.com/amiga/sonorox.git
-
-Build:1.0.1,4
-    commit=56eb0be122e
-    prebuild=sed -i -e 's/^import java.awt.*;/\/\/import java.awt.*;/' src/sonoroxadc/garethmurfin/co/uk/Water.java
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0.1
-Current Version Code:4
--- a/metadata/sonoroxadc.garethmurfin.co.uk.yml
+++ b/metadata/sonoroxadc.garethmurfin.co.uk.yml
@ -0,0 +1,28 @@
+Categories:
+  - Multimedia
+License: GPL-2.0-or-later
+WebSite: http://www.radiantsilverlabs.com/gaz
+SourceCode: https://github.com/amiga/sonorox
+IssueTracker: https://github.com/amiga/sonorox/issues
+
+AutoName: Sonorox
+Summary: Compose quick beats and loops
+Description: |-
+    It was inspired by the Yamaha Tenori-on and was a finalist in the Android
+    Developer Challenge 2 in 2009. Sonorox allows to compose short loops, and to
+    upload them to the Sonorox community website. You can also download other
+    peoples’ tunes and vote for them. The volume is determined by “Media Volume”.
+
+RepoType: git
+Repo: https://github.com/amiga/sonorox.git
+
+Builds:
+  - versionName: 1.0.1
+    versionCode: 4
+    commit: 56eb0be122e
+    prebuild: sed -i -e 's/^import java.awt.*;/\/\/import java.awt.*;/' src/sonoroxadc/garethmurfin/co/uk/Water.java
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.0.1
+CurrentVersionCode: 4
--- a/metadata/sony.hidden.servicemenu.txt
+++ b/metadata/sony.hidden.servicemenu.txt
@ -1,36 +0,0 @@
-Categories:System
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/LeoChirkov/Service-Menu
-Issue Tracker:https://github.com/LeoChirkov/Service-Menu/issues
-Changelog:https://github.com/LeoChirkov/Service-Menu/releases
-
-Auto Name:Service Menu
-Summary:Start hidden service menu
-Description:
-Shortcut to a hidden service menu which is also available by dialing a special
-code in the dialer:
-
-* Sony Service Menu - corresponds to *#*#7378423#*#* secret code
-* Android Testing Menu - corresponds to *#*#4636#*#* secret code
-.
-
-Repo Type:git
-Repo:https://github.com/LeoChirkov/Service-Menu
-
-Build:1.0,1
-    commit=9bf0f98a30dfad57dcf9fc8ffa9a5dd16a5e03e2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/AndroidStudioProjects/d' build.gradle
-
-Build:1.1,2
-    commit=6ab8e914f361e53aae9688ceb8ca902f6d6598f1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/AndroidStudioProjects/d' -e '/versionCode/d' build.gradle
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.1
-Current Version Code:2
--- a/metadata/sony.hidden.servicemenu.yml
+++ b/metadata/sony.hidden.servicemenu.yml
@ -0,0 +1,40 @@
+Categories:
+  - System
+License: GPL-3.0-or-later
+SourceCode: https://github.com/LeoChirkov/Service-Menu
+IssueTracker: https://github.com/LeoChirkov/Service-Menu/issues
+Changelog: https://github.com/LeoChirkov/Service-Menu/releases
+
+AutoName: Service Menu
+Summary: Start hidden service menu
+Description: |-
+    Shortcut to a hidden service menu which is also available by dialing a special
+    code in the dialer:
+
+    * Sony Service Menu - corresponds to *#*#7378423#*#* secret code
+    * Android Testing Menu - corresponds to *#*#4636#*#* secret code
+
+RepoType: git
+Repo: https://github.com/LeoChirkov/Service-Menu
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 9bf0f98a30dfad57dcf9fc8ffa9a5dd16a5e03e2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/AndroidStudioProjects/d' build.gradle
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: 6ab8e914f361e53aae9688ceb8ca902f6d6598f1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/AndroidStudioProjects/d' -e '/versionCode/d' build.gradle
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
--- a/metadata/souch.smp.txt
+++ b/metadata/souch.smp.txt
@ -1,98 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://gitlab.com/souch/SMP
-Issue Tracker:https://gitlab.com/souch/SMP/issues
-Changelog:https://gitlab.com/souch/SMP/tags
-Donate:http://rodolphe.souchaud.free.fr/donate
-
-Auto Name:SicMu Player
-Summary:Tree view based music player
-Description:
-Lightweight audio player which features a single over-all playlist with every
-song on the device.
-
-SicMu player can show songs in a tree view following device's folder hierarchy.
-Songs can be sorted and grouped by folders or artists.
-
-Many other features are available, see website.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/souch/SMP.git
-
-Build:0.2,2
-    commit=7e7a933845cf424da1969fa6591e80bdbe75c944
-    subdir=app
-    gradle=yes
-
-Build:0.3,3
-    commit=v0.3
-    subdir=app
-    gradle=yes
-
-Build:0.3.1,4
-    commit=v0.3.1
-    subdir=app
-    gradle=yes
-
-Build:0.4,5
-    commit=v0.4
-    subdir=app
-    gradle=yes
-
-Build:0.5,6
-    commit=v0.5
-    subdir=app
-    gradle=yes
-
-Build:0.6,7
-    commit=v0.6
-    subdir=app
-    gradle=yes
-
-Build:0.7,8
-    commit=v0.7
-    subdir=app
-    gradle=yes
-
-Build:0.8,9
-    commit=v0.8
-    subdir=app
-    gradle=yes
-
-Build:1.0,10
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,11
-    disable=failing
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Build:1.1.2,13
-    commit=v1.1.2
-    subdir=app
-    gradle=yes
-
-Build:1.2,14
-    commit=v1.2
-    subdir=app
-    gradle=yes
-
-Build:1.3,15
-    commit=v1.3
-    subdir=app
-    gradle=yes
-
-Build:1.4,16
-    commit=v1.4
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.4
-Current Version Code:16
--- a/metadata/souch.smp.yml
+++ b/metadata/souch.smp.yml
@ -0,0 +1,126 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+SourceCode: https://gitlab.com/souch/SMP
+IssueTracker: https://gitlab.com/souch/SMP/issues
+Changelog: https://gitlab.com/souch/SMP/tags
+Donate: http://rodolphe.souchaud.free.fr/donate
+
+AutoName: SicMu Player
+Summary: Tree view based music player
+Description: |-
+    Lightweight audio player which features a single over-all playlist with every
+    song on the device.
+
+    SicMu player can show songs in a tree view following device's folder hierarchy.
+    Songs can be sorted and grouped by folders or artists.
+
+    Many other features are available, see website.
+
+RepoType: git
+Repo: https://gitlab.com/souch/SMP.git
+
+Builds:
+  - versionName: '0.2'
+    versionCode: 2
+    commit: 7e7a933845cf424da1969fa6591e80bdbe75c944
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.3'
+    versionCode: 3
+    commit: v0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.1
+    versionCode: 4
+    commit: v0.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 5
+    commit: v0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.5'
+    versionCode: 6
+    commit: v0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.6'
+    versionCode: 7
+    commit: v0.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.7'
+    versionCode: 8
+    commit: v0.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.8'
+    versionCode: 9
+    commit: v0.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 10
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 11
+    disable: failing
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.2
+    versionCode: 13
+    commit: v1.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 14
+    commit: v1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 15
+    commit: v1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 16
+    commit: v1.4
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.4'
+CurrentVersionCode: 16
--- a/metadata/souch.smsbypass.txt
+++ b/metadata/souch.smsbypass.txt
@ -1,52 +0,0 @@
-Categories:Phone & SMS
-License:GPL-3.0-only
-Web Site:https://gitlab.com/souch/SMSbypass
-Source Code:https://gitlab.com/souch/SMSbypass/tree/HEAD
-Issue Tracker:https://gitlab.com/souch/SMSbypass/issues
-Donate:http://rodolphe.souchaud.free.fr/donate
-FlattrID:cad90e036b975ed129a3ce80a0750466
-
-Auto Name:Battery level
-Summary:Filter SMS and show them in a fake app
-Description:
-In order to keep away curious eyes, SMS-bypass filters incoming SMS messages
-before they reach your inbox. Based on [[bughunter2.smsfilter]].
-
-Features:
-
-* Discrete fake app "Battery level": Long tap on Battery percentage will show SMS.
-* Filter incoming SMS specified address: redirect the SMS to SMS-bypass messages list; remove SMS arrival sound or vibration; show a discreet notification icon (battery level); vibrate if checked in settings
-* Add contact from contact list
-* Export messages to a text file
-.
-
-Repo Type:git
-Repo:https://gitlab.com/souch/SMSbypass.git
-
-Build:0.8,5
-    commit=v0.8
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/minSdkVersion/amaxSdkVersion 19\n' build.gradle
-
-Build:0.8b,6
-    disable=don't build, just use as template for AUM, correct VC is 8
-    commit=2bd6164ff6391906af2af2b484de69a4ff926a01
-    subdir=app
-    gradle=yes
-
-Build:0.8.1,8
-    disable=mistagged
-    commit=v0.8.1
-    subdir=app
-    gradle=yes
-
-Build:0.9,9
-    commit=v0.9
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.9
-Current Version Code:9
--- a/metadata/souch.smsbypass.yml
+++ b/metadata/souch.smsbypass.yml
@ -0,0 +1,61 @@
+Categories:
+  - Phone & SMS
+License: GPL-3.0-only
+WebSite: https://gitlab.com/souch/SMSbypass
+SourceCode: https://gitlab.com/souch/SMSbypass/tree/HEAD
+IssueTracker: https://gitlab.com/souch/SMSbypass/issues
+Donate: http://rodolphe.souchaud.free.fr/donate
+FlattrID: cad90e036b975ed129a3ce80a0750466
+
+AutoName: Battery level
+Summary: Filter SMS and show them in a fake app
+Description: |-
+    In order to keep away curious eyes, SMS-bypass filters incoming SMS messages
+    before they reach your inbox. Based on [[bughunter2.smsfilter]].
+
+    Features:
+
+    * Discrete fake app "Battery level": Long tap on Battery percentage will show SMS.
+    * Filter incoming SMS specified address: redirect the SMS to SMS-bypass messages list; remove SMS arrival sound or vibration; show a discreet notification icon (battery level); vibrate if checked in settings
+    * Add contact from contact list
+    * Export messages to a text file
+
+RepoType: git
+Repo: https://gitlab.com/souch/SMSbypass.git
+
+Builds:
+  - versionName: '0.8'
+    versionCode: 5
+    commit: v0.8
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/minSdkVersion/amaxSdkVersion 19\n' build.gradle
+
+  - versionName: 0.8b
+    versionCode: 6
+    disable: don't build, just use as template for AUM, correct VC is 8
+    commit: 2bd6164ff6391906af2af2b484de69a4ff926a01
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.1
+    versionCode: 8
+    disable: mistagged
+    commit: v0.8.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.9'
+    versionCode: 9
+    commit: v0.9
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '0.9'
+CurrentVersionCode: 9
--- a/metadata/space.neothefox.laytray.txt
+++ b/metadata/space.neothefox.laytray.txt
@ -1,49 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:
-Source Code:https://gitlab.com/neothefox/LayTray
-Issue Tracker:https://gitlab.com/neothefox/LayTray/issues
-Changelog:https://gitlab.com/neothefox/LayTray/tags
-
-Auto Name:LayTray
-Summary:Layout indicator for Blackberry phones
-Description:
-This app keeps a small text icon in the notification area to let you know what
-Layout you are using. Developed for Blackberry KeyOne and possibly other QWERTY
-phones. This is based on the Toast notification that keyboard produces upon
-switching layouts.
-
-An icon can help users with short-term memory problems or vision problems
-interact with their device.
-
-YOU HAVE TO ENABLE THIS APPLICATION IN ACCESSIBILITY SETTING IN ORDER FOR IT TO
-WORK.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/neothefox/LayTray
-
-Build:1.6,7
-    commit=1.6
-    subdir=app
-    gradle=yes
-
-Build:1.7,8
-    commit=1.7
-    subdir=app
-    gradle=yes
-
-Build:1.8,9
-    commit=1.8
-    subdir=app
-    gradle=yes
-
-Build:1.9,10
-    commit=1.9
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.9
-Current Version Code:10
--- a/metadata/space.neothefox.laytray.yml
+++ b/metadata/space.neothefox.laytray.yml
@ -0,0 +1,57 @@
+Categories:
+  - System
+License: GPL-3.0-only
+SourceCode: https://gitlab.com/neothefox/LayTray
+IssueTracker: https://gitlab.com/neothefox/LayTray/issues
+Changelog: https://gitlab.com/neothefox/LayTray/tags
+
+AutoName: LayTray
+Summary: Layout indicator for Blackberry phones
+Description: |-
+    This app keeps a small text icon in the notification area to let you know what
+    Layout you are using. Developed for Blackberry KeyOne and possibly other QWERTY
+    phones. This is based on the Toast notification that keyboard produces upon
+    switching layouts.
+
+    An icon can help users with short-term memory problems or vision problems
+    interact with their device.
+
+    YOU HAVE TO ENABLE THIS APPLICATION IN ACCESSIBILITY SETTING IN ORDER FOR IT TO
+    WORK.
+
+RepoType: git
+Repo: https://gitlab.com/neothefox/LayTray
+
+Builds:
+  - versionName: '1.6'
+    versionCode: 7
+    commit: '1.6'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 8
+    commit: '1.7'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 9
+    commit: '1.8'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.9'
+    versionCode: 10
+    commit: '1.9'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.9'
+CurrentVersionCode: 10
--- a/metadata/starcom.snd.txt
+++ b/metadata/starcom.snd.txt
@ -1,35 +0,0 @@
-Categories:Connectivity
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/Starcommander/StreamRadio/
-Issue Tracker:https://github.com/Starcommander/StreamRadio/issues
-Changelog:https://github.com/Starcommander/StreamRadio/releases
-
-Auto Name:WebRadio
-Summary:Play radio channels from web and add custom channels
-Description:
-With this app you can play different radio channels from web. There are some pre
-configured channels, but you can also add custom channels. To add channels you
-need the stream-url of the channel.
-.
-
-Repo Type:git
-Repo:https://github.com/Starcommander/StreamRadio.git
-
-Build:1.0,1
-    commit=v1.0
-
-Build:1.2,2
-    commit=1.2
-    subdir=app
-    gradle=yes
-
-Build:1.3,3
-    commit=1.3
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:3
--- a/metadata/starcom.snd.yml
+++ b/metadata/starcom.snd.yml
@ -0,0 +1,40 @@
+Categories:
+  - Connectivity
+License: GPL-3.0-only
+SourceCode: https://github.com/Starcommander/StreamRadio/
+IssueTracker: https://github.com/Starcommander/StreamRadio/issues
+Changelog: https://github.com/Starcommander/StreamRadio/releases
+
+AutoName: WebRadio
+Summary: Play radio channels from web and add custom channels
+Description: |-
+    With this app you can play different radio channels from web. There are some pre
+    configured channels, but you can also add custom channels. To add channels you
+    need the stream-url of the channel.
+
+RepoType: git
+Repo: https://github.com/Starcommander/StreamRadio.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+
+  - versionName: '1.2'
+    versionCode: 2
+    commit: '1.2'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 3
+    commit: '1.3'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.3'
+CurrentVersionCode: 3
--- a/metadata/steele.gerry.dotty.txt
+++ b/metadata/steele.gerry.dotty.txt
@ -1,24 +0,0 @@
-Categories:Development
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/easytiger/dotty
-Issue Tracker:https://github.com/easytiger/dotty/issues
-
-Auto Name:Dotty
-Summary:Multitouch test
-Description:
-Dotty is a simple test application for diagnosing multitouch issues on android
-devices.
-.
-
-Repo Type:git
-Repo:https://github.com/easytiger/dotty.git
-
-Build:2,2
-    commit=f6762ce2d4fa565755d53b894ae8639b1ab27342
-    forceversion=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:Orignal
-Current Version Code:2
--- a/metadata/steele.gerry.dotty.yml
+++ b/metadata/steele.gerry.dotty.yml
@ -0,0 +1,25 @@
+Categories:
+  - Development
+License: GPL-3.0-only
+SourceCode: https://github.com/easytiger/dotty
+IssueTracker: https://github.com/easytiger/dotty/issues
+
+AutoName: Dotty
+Summary: Multitouch test
+Description: |-
+    Dotty is a simple test application for diagnosing multitouch issues on android
+    devices.
+
+RepoType: git
+Repo: https://github.com/easytiger/dotty.git
+
+Builds:
+  - versionName: '2'
+    versionCode: 2
+    commit: f6762ce2d4fa565755d53b894ae8639b1ab27342
+    forceversion: true
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: Orignal
+CurrentVersionCode: 2
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@ -1,76 +0,0 @@
-Disabled:Publish stericson.busybox instead: it's more limited but safer (since it doesn't have the restore option) and likely to get updated more often. The source code for this version is held back for a time (for financial gain, no doubt).
-Categories:System
-License:Apache-2.0
-Web Site:https://code.google.com/p/busybox-android
-Source Code:https://code.google.com/p/busybox-android/source
-Issue Tracker:
-
-Name:BusyBox Installer
-Summary:Interface to install system tools
-Description:
-'''N.B''' During testing it was found that the restore function wasn't working
-properly. It's recommended that you don't use it.
-
-Interface to install BusyBox 1.21.1 (just ARM architecture for now as the other
-ones can't be built) as well other versions off the internet (if you're brave).
-Don't install the 1.21.0 version as it isn't in the apk.
-
-BusyBox combines tiny versions of many common UNIX utilities into a single small
-executable. It provides replacements for most of the utilities you usually find
-in GNU fileutils, shellutils, etc. Android usually comes with a very limited
-multi-tool called Toolbox and sometimes it is crippled even more, so a standard
-Busybox is often needed by root apps that need to do different jobs.
-
-The app allows you backup and restore current binaries; to disable individual
-applets and see their help documentation. Just in case something goes wrong it
-would be wise to have a system image nearby that can be flashed via recovery or
-fastboot.
-
-The range of applets in
-[https://raw2.github.com/tias/android-busybox-ndk/master/android_ndk_stericson-like
-this] version isn't identical to the upstream version.
-
-Requires root.
-.
-
-Requires Root:yes
-
-Repo Type:git-svn
-Repo:https://busybox-android.googlecode.com/svn/trunk
-
-Build:10.3,161
-    commit=32
-    subdir=app/Pro
-    srclibs=1:ViewPagerIndicator@8cd549,RootToolsSvn@3.4,BusyboxConfigs-linusyang@63dc
-    rm=binaries,patches,app/Free,app/Pro/assets
-    prebuild=mkdir assets && \
-        cp -r $$RootToolsSvn$$/src/com/ src/ && \
-        cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
-        sed -i 's/darwin-x86_64/linux-x86/g;s/4.4.3/4.6/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
-    target=android-15
-    build=cd ../BB && \
-        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin:$PATH && \
-        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-        mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png
-
-Build:10.3.1,162
-    commit=37
-    subdir=deprecated/Pro
-    srclibs=1:ViewPagerIndicator@8cd549,RootToolsSvn@3.4,BusyboxConfigs-linusyang@63dc
-    forceversion=yes
-    forcevercode=yes
-    rm=binaries,patches,app,deprecated/Free,deprecated/Pro/assets
-    prebuild=mkdir assets && \
-        cp -r $$RootToolsSvn$$/src/com/ src/ && \
-        cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
-        sed -i 's/darwin-x86_64/linux-x86/g;s/4.4.3/4.6/;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
-    target=android-15
-    build=cd ../BB && \
-        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin:$PATH && \
-        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-        mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:10.3.1
-Current Version Code:162
--- a/metadata/streetwalrus.usbmountr.txt
+++ b/metadata/streetwalrus.usbmountr.txt
@ -1,79 +0,0 @@
-Categories:System
-License:MIT
-Web Site:
-Source Code:https://github.com/Streetwalrus/android_usb_msd
-Issue Tracker:https://github.com/Streetwalrus/android_usb_msd/issues
-Changelog:https://github.com/Streetwalrus/android_usb_msd/releases
-
-Auto Name:USB Mountr
-Summary:Use your device as a USB flash drive
-Description:
-A helper application to set the Mass Storage Device gadget up in Android kernels
-
-Android kernels still include a USB MSD component in their device gadget
-nowadays, though it is mostly unused since Android started using MTP. Some OEM
-ROMs still use it to provide a drivers installation "disc", but it is otherwise
-useless.
-
-This application leverages the module in order to let you use your device as a
-standard USB thumbdrive for the purpose of, e.g., booting a distro ISO.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/Streetwalrus/android_usb_msd
-
-Build:0.3,1
-    commit=0.3
-    subdir=app
-    gradle=yes
-
-Build:0.3.1.1,2
-    commit=0.3.1.1
-    subdir=app
-    gradle=yes
-
-Build:0.3.1.2,3
-    commit=0.3.1.2
-    subdir=app
-    gradle=yes
-
-Build:0.4,4
-    commit=0.4
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:0.5,5
-    commit=0.5
-    subdir=app
-    gradle=yes
-    rm=gradle
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:0.5.1,6
-    commit=0.5.1
-    subdir=app
-    gradle=yes
-    rm=gradle
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:0.5.2,7
-    commit=0.5.2
-    subdir=app
-    gradle=yes
-    rm=gradle
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:0.6,8
-    commit=0.6
-    subdir=app
-    gradle=yes
-    rm=gradle
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.6
-Current Version Code:8
--- a/metadata/streetwalrus.usbmountr.yml
+++ b/metadata/streetwalrus.usbmountr.yml
@ -0,0 +1,104 @@
+Categories:
+  - System
+License: MIT
+SourceCode: https://github.com/Streetwalrus/android_usb_msd
+IssueTracker: https://github.com/Streetwalrus/android_usb_msd/issues
+Changelog: https://github.com/Streetwalrus/android_usb_msd/releases
+
+AutoName: USB Mountr
+Summary: Use your device as a USB flash drive
+Description: |-
+    A helper application to set the Mass Storage Device gadget up in Android kernels
+
+    Android kernels still include a USB MSD component in their device gadget
+    nowadays, though it is mostly unused since Android started using MTP. Some OEM
+    ROMs still use it to provide a drivers installation "disc", but it is otherwise
+    useless.
+
+    This application leverages the module in order to let you use your device as a
+    standard USB thumbdrive for the purpose of, e.g., booting a distro ISO.
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/Streetwalrus/android_usb_msd
+
+Builds:
+  - versionName: '0.3'
+    versionCode: 1
+    commit: '0.3'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.1.1
+    versionCode: 2
+    commit: 0.3.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.1.2
+    versionCode: 3
+    commit: 0.3.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 4
+    commit: '0.4'
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '0.5'
+    versionCode: 5
+    commit: '0.5'
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: 0.5.1
+    versionCode: 6
+    commit: 0.5.1
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: 0.5.2
+    versionCode: 7
+    commit: 0.5.2
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '0.6'
+    versionCode: 8
+    commit: '0.6'
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '0.6'
+CurrentVersionCode: 8
--- a/metadata/subreddit.android.appstore.txt
+++ b/metadata/subreddit.android.appstore.txt
@ -1,59 +0,0 @@
-AntiFeatures:NonFreeAdd,NonFreeNet
-Categories:System
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/d4rken/reddit-android-appstore
-Issue Tracker:https://github.com/d4rken/reddit-android-appstore/issues
-Changelog:https://github.com/d4rken/reddit-android-appstore/releases
-
-Auto Name:/r/Android App store
-Summary:Download apps curated by /r/android
-Description:
-App inspired by this
-[https://www.reddit.com/r/Android/comments/50rafp/meta_we_have_an_app_wiki_with_over_700_apps_made/
-reddit post]
-
-Pulls the curated app list from the [https://www.reddit.com/r/android/wiki/apps
-/r/Android wiki] and displays it.
-
-As it offers non free apps as well, this app has the non free addon antifeature.
-.
-
-Repo Type:git
-Repo:https://github.com/d4rken/reddit-android-appstore.git
-
-Build:0.3.1,3100
-    commit=v0.3.1
-    subdir=app
-    gradle=yes
-
-Build:0.4.0,4000
-    disable=dontbuild
-    commit=v0.4.0
-    subdir=app
-    gradle=yes
-
-Build:0.5.0,5000
-    disable=dontbuild
-    commit=v0.5.0
-    subdir=app
-    gradle=yes
-
-Build:0.6.0,6000
-    commit=3e75392cc112a48198bcb82b36ac045aa348c9e4
-    subdir=app
-    gradle=yes
-
-Build:0.7.1,7100
-    commit=v0.7.1
-    subdir=app
-    gradle=yes
-
-Maintainer Notes:
-Version and VC are generated on build, no way to check for updates.
-.
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:0.7.1
-Current Version Code:7100
--- a/metadata/subreddit.android.appstore.yml
+++ b/metadata/subreddit.android.appstore.yml
@ -0,0 +1,69 @@
+AntiFeatures:
+  - NonFreeAdd
+  - NonFreeNet
+Categories:
+  - System
+License: Apache-2.0
+SourceCode: https://github.com/d4rken/reddit-android-appstore
+IssueTracker: https://github.com/d4rken/reddit-android-appstore/issues
+Changelog: https://github.com/d4rken/reddit-android-appstore/releases
+
+AutoName: /r/Android App store
+Summary: Download apps curated by /r/android
+Description: |-
+    App inspired by this
+    [https://www.reddit.com/r/Android/comments/50rafp/meta_we_have_an_app_wiki_with_over_700_apps_made/
+    reddit post]
+
+    Pulls the curated app list from the [https://www.reddit.com/r/android/wiki/apps
+    /r/Android wiki] and displays it.
+
+    As it offers non free apps as well, this app has the non free addon antifeature.
+
+RepoType: git
+Repo: https://github.com/d4rken/reddit-android-appstore.git
+
+Builds:
+  - versionName: 0.3.1
+    versionCode: 3100
+    commit: v0.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.0
+    versionCode: 4000
+    disable: dontbuild
+    commit: v0.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.0
+    versionCode: 5000
+    disable: dontbuild
+    commit: v0.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.6.0
+    versionCode: 6000
+    commit: 3e75392cc112a48198bcb82b36ac045aa348c9e4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.7.1
+    versionCode: 7100
+    commit: v0.7.1
+    subdir: app
+    gradle:
+      - yes
+
+MaintainerNotes: Version and VC are generated on build, no way to check for updates.
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: 0.7.1
+CurrentVersionCode: 7100
--- a/metadata/sun.bob.leela.txt
+++ b/metadata/sun.bob.leela.txt
@ -1,44 +0,0 @@
-Categories:Security,Internet
-License:MIT
-Web Site:
-Source Code:https://github.com/PuffOpenSource/Puff-Android
-Issue Tracker:https://github.com/PuffOpenSource/Puff-Android/issues
-Changelog:https://github.com/PuffOpenSource/Puff-Android/releases
-
-Auto Name:Puff
-Summary:Password Utility
-Description:
-Puff provide two ways for quick access your account credentials.
-
-Pin means pin your account information in a notification. As you can see in the
-screenshot, for each credential there is a button in the notification. Click
-that button the credential will be copied to your clipboard automatically. And
-the notification will be dissmissed in 1 minute.
-
-Puff Secure Keyboard is a keyboard, aka input method. You can switch to it like
-other input method programs. The different between Puff keyboard and other IMEs
-is Puff keyboard can access your credential quickly. Just click on the blowfish
-icon and a dialog contains your account list will pop up. Select one and decrypt
-it with your master password. Then click the other three keys in Puff keyboard
-which stands for 'Account', 'Password' & 'Additional Field' which will auto fill
-the corresponding information for you.
-.
-
-Repo Type:git
-Repo:https://github.com/PuffOpenSource/Puff-Android.git
-
-Build:1.0,1
-    disable=somehow failed on the BS
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.2,2
-    commit=v1.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2
-Current Version Code:2
--- a/metadata/sun.bob.leela.yml
+++ b/metadata/sun.bob.leela.yml
@ -0,0 +1,49 @@
+Categories:
+  - Security
+  - Internet
+License: MIT
+SourceCode: https://github.com/PuffOpenSource/Puff-Android
+IssueTracker: https://github.com/PuffOpenSource/Puff-Android/issues
+Changelog: https://github.com/PuffOpenSource/Puff-Android/releases
+
+AutoName: Puff
+Summary: Password Utility
+Description: |-
+    Puff provide two ways for quick access your account credentials.
+
+    Pin means pin your account information in a notification. As you can see in the
+    screenshot, for each credential there is a button in the notification. Click
+    that button the credential will be copied to your clipboard automatically. And
+    the notification will be dissmissed in 1 minute.
+
+    Puff Secure Keyboard is a keyboard, aka input method. You can switch to it like
+    other input method programs. The different between Puff keyboard and other IMEs
+    is Puff keyboard can access your credential quickly. Just click on the blowfish
+    icon and a dialog contains your account list will pop up. Select one and decrypt
+    it with your master password. Then click the other three keys in Puff keyboard
+    which stands for 'Account', 'Password' & 'Additional Field' which will auto fill
+    the corresponding information for you.
+
+RepoType: git
+Repo: https://github.com/PuffOpenSource/Puff-Android.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    disable: somehow failed on the BS
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 2
+    commit: v1.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.2'
+CurrentVersionCode: 2
--- a/metadata/swati4star.createpdf.txt
+++ b/metadata/swati4star.createpdf.txt
@ -1,97 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-or-later
-Web Site:https://swati4star.github.io/Images-to-PDF
-Source Code:https://github.com/Swati4star/Images-to-PDF
-Issue Tracker:https://github.com/Swati4star/Images-to-PDF/issues
-Changelog:https://github.com/Swati4star/Images-to-PDF/releases
-
-Auto Name:PDF Converter
-Summary:Create PDF files
-Description:
-Convert images to PDF file.
-
-* No internet connection required ( ⭐)
-* Smooth and easy to use interface
-* Takes up only a few seconds
-* Select images from camera/gallery
-* Image enhancement features
-* Crop images before creating a PDF
-* View PDF files
-* Delete PDF files
-* Share the created PDFs with your friends
-* Easily manage the PDFs created by our app
-
-Supported input types:
-
-* JPG
-* PNG
-
-...and other image formats!
-.
-
-Repo Type:git
-Repo:https://github.com/Swati4star/Images-to-PDF
-
-Build:1.0,1
-    commit=640e989ef7cd6c7e9104ea68ecc572f60ae6ff31
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/mavenCentral/ajcenter()'  -e 's@http://repo.commonsware.com.s3.amazonaws.com@https://s3.amazonaws.com/repo.commonsware.com@g' build.gradle
-
-Build:2.5,8
-    commit=2.5
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's|http://repo.commonsware.com.s3.amazonaws.com|https://s3.amazonaws.com/repo.commonsware.com|g' build.gradle
-
-Build:8.0.0,53
-    disable=maven url
-    commit=8.0.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's|http://repo.commonsware.com.s3.amazonaws.com|https://s3.amazonaws.com/repo.commonsware.com|g' build.gradle
-
-Build:8.3.3,60
-    commit=8.3.3
-    subdir=app
-    gradle=yes
-
-Build:8.3.8,65
-    commit=8.3.8
-    subdir=app
-    gradle=yes
-
-Build:8.4.2,69
-    commit=8.4.2
-    subdir=app
-    gradle=yes
-
-Build:8.4.5,72
-    commit=8.4.5
-    subdir=app
-    gradle=yes
-
-Build:8.4.7,74
-    commit=8.4.7
-    subdir=app
-    gradle=yes
-
-Build:8.5.2,79
-    commit=8.5.2
-    subdir=app
-    gradle=yes
-
-Build:8.5.3,80
-    commit=8.5.3
-    subdir=app
-    gradle=yes
-
-Build:8.5.6,83
-    commit=8.5.6
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:8.5.6
-Current Version Code:83
--- a/metadata/swati4star.createpdf.yml
+++ b/metadata/swati4star.createpdf.yml
@ -0,0 +1,123 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-or-later
+WebSite: https://swati4star.github.io/Images-to-PDF
+SourceCode: https://github.com/Swati4star/Images-to-PDF
+IssueTracker: https://github.com/Swati4star/Images-to-PDF/issues
+Changelog: https://github.com/Swati4star/Images-to-PDF/releases
+
+AutoName: PDF Converter
+Summary: Create PDF files
+Description: |-
+    Convert images to PDF file.
+
+    * No internet connection required ( ⭐)
+    * Smooth and easy to use interface
+    * Takes up only a few seconds
+    * Select images from camera/gallery
+    * Image enhancement features
+    * Crop images before creating a PDF
+    * View PDF files
+    * Delete PDF files
+    * Share the created PDFs with your friends
+    * Easily manage the PDFs created by our app
+
+    Supported input types:
+
+    * JPG
+    * PNG
+
+    ...and other image formats!
+
+RepoType: git
+Repo: https://github.com/Swati4star/Images-to-PDF
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 640e989ef7cd6c7e9104ea68ecc572f60ae6ff31
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/mavenCentral/ajcenter()'  -e 's@http://repo.commonsware.com.s3.amazonaws.com@https://s3.amazonaws.com/repo.commonsware.com@g'
+        build.gradle
+
+  - versionName: '2.5'
+    versionCode: 8
+    commit: '2.5'
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's|http://repo.commonsware.com.s3.amazonaws.com|https://s3.amazonaws.com/repo.commonsware.com|g'
+        build.gradle
+
+  - versionName: 8.0.0
+    versionCode: 53
+    disable: maven url
+    commit: 8.0.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's|http://repo.commonsware.com.s3.amazonaws.com|https://s3.amazonaws.com/repo.commonsware.com|g'
+        build.gradle
+
+  - versionName: 8.3.3
+    versionCode: 60
+    commit: 8.3.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 8.3.8
+    versionCode: 65
+    commit: 8.3.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 8.4.2
+    versionCode: 69
+    commit: 8.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 8.4.5
+    versionCode: 72
+    commit: 8.4.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 8.4.7
+    versionCode: 74
+    commit: 8.4.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 8.5.2
+    versionCode: 79
+    commit: 8.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 8.5.3
+    versionCode: 80
+    commit: 8.5.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 8.5.6
+    versionCode: 83
+    commit: 8.5.6
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 8.5.6
+CurrentVersionCode: 83
--- a/metadata/systems.byteswap.aiproute.txt
+++ b/metadata/systems.byteswap.aiproute.txt
@ -1,31 +0,0 @@
-Categories:System,Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/benjaminaigner/aiproute
-Issue Tracker:https://github.com/benjaminaigner/aiproute/issues
-
-Auto Name:AIProute
-Summary:Change IP routes for the Wifi interface
-Description:
-This app allows you to add specific IP routes on Android to route the IP
-traffic. It is possible to set address, netmask, gateway and metric. Due to the
-nature of the "ip route" command, root access is necessary. It is possible to
-apply routes based on the active SSID, to ensure the route is only applied in
-the correct Wifi network. If it is set, the routes are applied during the
-Android boot.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/benjaminaigner/aiproute
-
-Build:0.1,1
-    commit=8429004ed3fa6f5f794cba66bc27975060f43110
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.1
-Current Version Code:1
--- a/metadata/systems.byteswap.aiproute.yml
+++ b/metadata/systems.byteswap.aiproute.yml
@ -0,0 +1,34 @@
+Categories:
+  - System
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/benjaminaigner/aiproute
+IssueTracker: https://github.com/benjaminaigner/aiproute/issues
+
+AutoName: AIProute
+Summary: Change IP routes for the Wifi interface
+Description: |-
+    This app allows you to add specific IP routes on Android to route the IP
+    traffic. It is possible to set address, netmask, gateway and metric. Due to the
+    nature of the "ip route" command, root access is necessary. It is possible to
+    apply routes based on the active SSID, to ensure the route is only applied in
+    the correct Wifi network. If it is set, the routes are applied during the
+    Android boot.
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/benjaminaigner/aiproute
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: 8429004ed3fa6f5f794cba66bc27975060f43110
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '0.1'
+CurrentVersionCode: 1
--- a/metadata/szelok.app.twister.txt
+++ b/metadata/szelok.app.twister.txt
@ -1,22 +0,0 @@
-Categories:Internet
-License:MIT
-Web Site:
-Source Code:https://github.com/szelok/twister-android
-Issue Tracker:https://github.com/szelok/twister-android/issues
-
-Auto Name:Twister
-Summary:Client for Twister
-Description:
-Third-party client for the Twister peer-to-peer microblogging platform.
-.
-
-Repo Type:git
-Repo:https://github.com/szelok/twister-android
-
-Build:1.0,1
-    commit=323b27dd85bcdd1783b04cf8499f5970bb494cc0
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0
-Current Version Code:1
--- a/metadata/szelok.app.twister.yml
+++ b/metadata/szelok.app.twister.yml
@ -0,0 +1,22 @@
+Categories:
+  - Internet
+License: MIT
+SourceCode: https://github.com/szelok/twister-android
+IssueTracker: https://github.com/szelok/twister-android/issues
+
+AutoName: Twister
+Summary: Client for Twister
+Description: Third-party client for the Twister peer-to-peer microblogging platform.
+
+RepoType: git
+Repo: https://github.com/szelok/twister-android
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 323b27dd85bcdd1783b04cf8499f5970bb494cc0
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.0'
+CurrentVersionCode: 1