Merge branch 'patch-1' into 'master'

net.asceai.meritous.txt: new version See merge request fdroid/fdroiddata!3962
2018-12-29 17:29:16 +00:00 · 2018-12-29 17:29:16 +00:00 · e9215843a4
parent f7c7894d8b f3822222c9
commit e9215843a4
2 changed files with 58 additions and 61 deletions
--- a/metadata/net.asceai.meritous.txt
+++ b/metadata/net.asceai.meritous.txt
@ -1,61 +0,0 @@
-Categories:Games
-License:GPL-3.0-or-later
-Web Site:http://asceai.net/meritous
-Source Code:https://gitlab.com/meritous
-Issue Tracker:
-
-Summary:Dungeon crawl game
-Description:
-Far below the surface of the planet is a secret. A place of limitless power.
-Those that seek to control such a utopia will soon bring an end to themselves.
-Seeking an end to the troubles that plague him, PSI user MERIT journeys into the
-hallowed Orcus Dome in search of answers.
-
-Meritous is a action-adventure game with simple controls but a challenge to find
-a balance of power verses recovery time during real-time battles. Set in a
-fractually-generated world, the player can explore thousands of rooms in search
-of powerful artifacts, tools to help them, and to eventually free the Orcus Dome
-from evil.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/meritous/sdl_android.git
-
-Build:0.0.1,1
-    commit=03ac99d71e34010491f7a5c578d2ae9c44d73cf3
-    subdir=project
-    submodules=yes
-    init=cd .. && \
-        make -C src/AndroidData && \
-        ./changeAppSettings.sh -a && \
-        export PATH=$$NDK$$:$$SDK$$/tools:$PATH && \
-        ./build.sh || true
-    update=no
-
-Build:0.0.2,2
-    commit=78aeec506e0cc88e865bd86fb41728f4257ddae6
-    subdir=project
-    submodules=yes
-    init=cd .. && \
-        make -C src/AndroidData && \
-        ./changeAppSettings.sh -a && \
-        export PATH=$$NDK$$:$$SDK$$/tools:$PATH && \
-        ./build.sh release || true
-    update=no
-
-Build:0.0.2,3
-    disable=same as 0.0.2
-    commit=b716c4d43ab901821a0e2c1f25e6c050d5e37346
-    subdir=project
-    submodules=yes
-    init=cd .. && \
-        make -C src/AndroidData && \
-        ./changeAppSettings.sh -a && \
-        export PATH=$$NDK$$:$$SDK$$/tools:$PATH && \
-        ./build.sh release || true
-    update=no
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.0.2
-Current Version Code:2
--- a/metadata/net.asceai.meritous.yml
+++ b/metadata/net.asceai.meritous.yml
@ -0,0 +1,58 @@
+Categories:
+  - Games
+License: GPL-3.0-or-later
+AuthorName: Sylvain Beucler
+AuthorEmail: beuc@beuc.net
+WebSite: http://asceai.net/meritous
+SourceCode: https://gitlab.com/meritous
+
+Summary: Dungeon crawl game
+Description: |-
+    Far below the surface of the planet is a secret. A place of limitless power.  Those that seek to control such a utopia will soon bring an end to themselves.  Seeking an end to the troubles that plague him, PSI user MERIT journeys into the hallowed Orcus Dome in search of answers.
+    Meritous is a action-adventure game with simple controls but a challenge to find a balance of power verses recovery time during real-time battles. Set in a fractually-generated world, the player can explore thousands of rooms in search of powerful artifacts, tools to help them, and to eventually free the Orcus Dome from evil.  .
+
+RepoType: git
+Repo: https://gitlab.com/meritous/sdl_android.git
+
+Builds:
+  - versionName: 0.0.1
+    versionCode: 1
+    commit: 03ac99d71e34010491f7a5c578d2ae9c44d73cf3
+    subdir: project
+    submodules: true
+    init: |-
+        cd .. && make -C src/AndroidData && ./changeAppSettings.sh -a && export PATH=$$NDK$$:$$SDK$$/tools:$PATH && ./build.sh || true
+
+  - versionName: 0.0.2
+    versionCode: 2
+    commit: 78aeec506e0cc88e865bd86fb41728f4257ddae6
+    subdir: project
+    submodules: true
+    init: |-
+        cd .. && make -C src/AndroidData && ./changeAppSettings.sh -a && export PATH=$$NDK$$:$$SDK$$/tools:$PATH && ./build.sh release || true
+
+  - versionName: 0.0.2
+    versionCode: 3
+    disable: same as 0.0.2
+    commit: b716c4d43ab901821a0e2c1f25e6c050d5e37346
+    subdir: project
+    submodules: true
+    init: |-
+        cd .. && make -C src/AndroidData && ./changeAppSettings.sh -a && export PATH=$$NDK$$:$$SDK$$/tools:$PATH && ./build.sh release || true
+
+  - versionName: 0.0.4
+    versionCode: 4
+    commit: bd3b5386fb6211d12af4f69daa125750b556ac19
+    subdir: project/app
+    submodules: true
+    init: |-
+        cd ../.. && make -C src/AndroidData && ./changeAppSettings.sh -a
+    gradle:
+      - yes
+    build: cd ../.. && ./build.sh release || true
+    ndk: r18b
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 0.0.4
+CurrentVersionCode: 4