Merge branch 'todo-agenda-4-1-0' into 'master'

ToDo Agenda v.4.1.0. Reverting to static versionName and versionCode in order to automate updates in F-Droid

See merge request fdroid/fdroiddata!7051

metadata/com.plusonelabs.calendar.yml

@@ -2,7 +2,7 @@ Categories:
   - Time
 License: Apache-2.0
 SourceCode: https://github.com/andstatus/todoagenda
-IssueTracker: https://github.com/plusonelabs/calendar-widget/issues
+IssueTracker: https://github.com/andstatus/todoagenda/issues
 Changelog: https://github.com/andstatus/todoagenda/blob/HEAD/README.md#changelog
 
 Name: Todo Agenda for Android 4 - 7.0
@@ -13,8 +13,8 @@ Description: |-
 
     Since November 2019 the app changed its ID in F-Droid from "com.plusonelabs.calendar"
     to "org.andstatus.todoagenda" i.e. to its current real Android package name.
-    The new app at F-Droid web site: [[org.andstatus.todoagenda]]
-    Upcoming releases of the new app will support Android 7.1.1+ only.
+    The new app at F-Droid web site: [https://f-droid.org/en/packages/org.andstatus.todoagenda/ ToDo Agenda]
+    Upcoming releases of the new app will support Android 7.0+ only.
 
     The name of the new app entry in F-Droid stays the same: "Todo Agenda" (because the app itself isn't changed).
     But the name of this legacy app entry in F-Droid is changed to "Todo Agenda for Android 4 - 7.0" to avoid users' confusion.

metadata/org.andstatus.todoagenda.yml

@@ -2,7 +2,7 @@ Categories:
   - Time
 License: Apache-2.0
 SourceCode: https://github.com/andstatus/todoagenda
-IssueTracker: https://github.com/plusonelabs/calendar-widget/issues
+IssueTracker: https://github.com/andstatus/todoagenda/issues
 Changelog: https://github.com/andstatus/todoagenda/blob/HEAD/README.md#changelog
 
 AutoName: Todo Agenda
@@ -25,8 +25,8 @@ Description: |-
     * Indicators for alerts and recurring events.
     * Lock time zone when travelling to different time zones.
     * Turn off Widget or Day headers, event icons, Days from today, etc. and see only what you need.
-    * Android 7.1+ supported. Supports Android tablets.
-    For the older devices please use "Todo Agenda for Android 4 - 7.0" app [[com.plusonelabs.calendar]]
+    * Android 7.0+ supported. Supports Android tablets.
+    For the older devices please use [https://f-droid.org/en/packages/com.plusonelabs.calendar/ Todo Agenda for Android 4 - 7.0] app.
 
 RepoType: git
 Repo: https://github.com/andstatus/todoagenda.git
@@ -46,11 +46,19 @@ Builds:
     gradle:
       - yes
 
-MaintainerNotes: |-
-    Upstream generates CV and CVC from git, so we don't catch that anymore,
-    see https://github.com/plusonelabs/calendar-widget/issues/210.
+  - versionName: 4.1.0
+    versionCode: 681
+    commit: 4.1.0-release
+    subdir: app
+    gradle:
+      - yes
 
-AutoUpdateMode: None
-UpdateCheckMode: None
-CurrentVersion: 3.1.9-565
-CurrentVersionCode: 565
+MaintainerNotes: |-
+    Since v.4.1 upstream reverted to static versionName and versionCode,
+    at least till F-Droid starts supporting this,
+    see https://gitlab.com/fdroid/fdroidserver/-/issues/420#note_299995680
+
+AutoUpdateMode: Version %v-release
+UpdateCheckMode: Tags ^[0-9.]+-release$
+CurrentVersion: 4.1.0
+CurrentVersionCode: 681