Merge branch 'miscfixes39' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!7219

metadata/com.bernaferrari.sdkmonitor.yml

@@ -25,13 +25,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '0.98'
-    versionCode: 11
-    commit: '0.98'
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: '0.98'
     versionCode: 12
     commit: '0.98'

metadata/de.blinkt.openvpn.yml

@@ -396,7 +396,7 @@ Builds:
 
   - versionName: 0.7.17a
     versionCode: 171
-    commit: v%V
+    commit: v0.7.17a
     subdir: main
     submodules: true
     gradle:
@@ -413,7 +413,7 @@ MaintainerNotes: |-
     Build instructions:
     https://github.com/schwabe/ics-openvpn/blob/master/.travis.yml
 
-AutoUpdateMode: Version v%V
+AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
 CurrentVersion: 0.7.17a
 CurrentVersionCode: 171

metadata/de.luhmer.owncloudnewsreader.yml

@@ -1386,7 +1386,7 @@ Builds:
 
   - versionName: 0.9.9.37
     versionCode: 153
-    commit: v.0.9.9.37
+    commit: v.0.9.9.38
     subdir: News-Android-App
     init:
       - sed -i -e '/com.nbsp:library/d' build.gradle

metadata/io.treehouses.remote.yml

@@ -84,34 +84,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '4699'
-    versionCode: 4699
-    commit: fdroid-4699
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: '4740'
-    versionCode: 4740
-    commit: fdroid-4740
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: '4804'
-    versionCode: 4804
-    commit: fdroid-4804
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: '4845'
-    versionCode: 4845
-    commit: fdroid-4845
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: '4859'
     versionCode: 4859
     commit: fdroid-4859

metadata/it.niedermann.nextcloud.deck.yml

@@ -313,20 +313,6 @@ Builds:
     gradle:
       - fdroid
 
-  - versionName: 1.9.4
-    versionCode: 1009004
-    commit: 1.9.4
-    subdir: app
-    gradle:
-      - fdroid
-
-  - versionName: 1.9.5
-    versionCode: 1009005
-    commit: 1.9.5
-    subdir: app
-    gradle:
-      - fdroid
-
   - versionName: 1.9.6
     versionCode: 1009006
     commit: 1.9.6

metadata/org.sufficientlysecure.viewer.yml

@@ -1663,52 +1663,6 @@ Builds:
       - yes
     ndk: r16b
 
-  - versionName: 2.8.2
-    versionCode: 2825
-    commit: v2.8.2
-    subdir: document-viewer
-    submodules: true
-    gradle:
-      - yes
-    forcevercode: true
-    prebuild:
-      - sed -i -e '/splits/,+7d' build.gradle
-      - sed -i -e '/applicationVariants\.all/,+5d' build.gradle
-      - sed -i -e '/ext\.versionCode/d' build.gradle
-      - echo "APP_ABI := arm64-v8a" > jni/Application.mk
-      - pushd ../
-      - ./init.sh
-      - popd
-    scandelete:
-      - document-viewer/jni/mupdf/mupdf/build/release/
-      - document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
-    buildjni:
-      - yes
-    ndk: r16b
-
-  - versionName: 2.8.2
-    versionCode: 2826
-    commit: v2.8.2
-    subdir: document-viewer
-    submodules: true
-    gradle:
-      - yes
-    forcevercode: true
-    prebuild:
-      - sed -i -e '/splits/,+7d' build.gradle
-      - sed -i -e '/applicationVariants\.all/,+5d' build.gradle
-      - sed -i -e '/ext\.versionCode/d' build.gradle
-      - echo "APP_ABI := x86_64" > jni/Application.mk
-      - pushd ../
-      - ./init.sh
-      - popd
-    scandelete:
-      - document-viewer/jni/mupdf/mupdf/build/release/
-      - document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
-    buildjni:
-      - yes
-    ndk: r16b
-
   - versionName: 2.8.2
     versionCode: 2827
     commit: v2.8.2

metadata/org.ttrssreader.yml

@@ -575,14 +575,6 @@ Builds:
       - fdroid
     prebuild: sed -i -e '/playCompile/d' build.gradle
 
-  - versionName: 1.95.2
-    versionCode: 1954
-    commit: v1.95.2_1954
-    subdir: ttrssreader
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/playCompile/d' build.gradle
-
   - versionName: 1.95.7
     versionCode: 1957
     commit: v1.95.7_1957

metadata/rocks.poopjournal.flashy.yml

@@ -22,21 +22,14 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '1.1'
-    versionCode: 2
-    commit: '1.1'
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: '1.2'
     versionCode: 3
-    commit: '1.2'
+    commit: v1.2
     subdir: app
     gradle:
       - yes
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
 CurrentVersion: '1.2'
 CurrentVersionCode: 3