From d5a74213d6d8c0043ff4538df7b4a7b0ef08f6fe Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Thu, 24 Sep 2026 22:32:01 +0200 Subject: [PATCH] docs: sync the F-Droid recipe with the submitted one Pinned to the v1.0.0 commit hash as fdroiddata requires; the README now tracks the submission (fdroiddata!49998) instead of the steps to make it. --- docs/fdroid-official/README.md | 18 +++++++++--------- .../de.jeanlucmakiola.agendula.yml | 15 +-------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/docs/fdroid-official/README.md b/docs/fdroid-official/README.md index eda1fae..06e56ee 100644 --- a/docs/fdroid-official/README.md +++ b/docs/fdroid-official/README.md @@ -34,17 +34,17 @@ Nothing listing-related goes in the recipe. F-Droid harvests is fed from: title, descriptions, icon, feature graphic, screenshots and `changelogs/.txt`. `title.txt` becomes the app name per locale. -## Submitting +## Status -After `v1.0.0` is tagged and `agendula_v1.0.0.apk` is live on the self-hosted -repo: +Submitted as [fdroiddata!49998](https://gitlab.com/fdroid/fdroiddata/-/merge_requests/49998) +on 2026-09-24. Its CI rebuilt v1.0.0 and verified it against our published APK +("compared built binary to supplied reference binary successfully"). -1. Fork `https://gitlab.com/fdroid/fdroiddata`, copy the recipe to - `metadata/de.jeanlucmakiola.agendula.yml`. -2. `fdroid readmeta && fdroid lint de.jeanlucmakiola.agendula`, then - `fdroid build -v -l de.jeanlucmakiola.agendula` to rebuild and verify. -3. Open the merge request. Later versions are picked up from new `vX.Y.Z` tags - (`AutoUpdateMode`), so there is no per-release work in fdroiddata. +The file here is a copy of the submitted recipe. fdroiddata's copy is the one +that counts; after the merge F-Droid picks up new `vX.Y.Z` tags on its own +(`AutoUpdateMode`), so there is no per-release work there. Only a change to the +recipe itself (a new submodule, a build flag) needs an MR, pinned to a full +commit hash, never a tag. The recipe says `License: MIT`; `:dav` is vendored MPL-2.0 (`dav/PROVENANCE.md`). If the reviewer asks, change it to `MIT AND MPL-2.0`. diff --git a/docs/fdroid-official/de.jeanlucmakiola.agendula.yml b/docs/fdroid-official/de.jeanlucmakiola.agendula.yml index 8f10f32..6c8bde9 100644 --- a/docs/fdroid-official/de.jeanlucmakiola.agendula.yml +++ b/docs/fdroid-official/de.jeanlucmakiola.agendula.yml @@ -1,11 +1,3 @@ -# Draft fdroiddata recipe for the OFFICIAL F-Droid repository. Submitted as -# metadata/de.jeanlucmakiola.agendula.yml in fdroiddata; see README.md here. -# Not the self-hosted control file (that is ../../fdroid-metadata/). -# -# Reproducible build + developer-signed binary: F-Droid rebuilds from source, -# compares against our APK from `Binaries`, and on a match publishes OUR binary, -# so official and self-hosted installs share one signature. - Categories: - Task License: MIT @@ -22,15 +14,10 @@ RepoType: git Repo: https://codeberg.org/jlmakiola/agendula.git Binaries: https://apps.dev.jeanlucmakiola.de/dev/fdroid/repo/agendula_v%v.apk -# 1.0.0 is the first release that carries every reproducibility fix -# (scripts/check_reproducible_release.sh); 0.x releases strip datastore's .so -# files host-dependently and won't verify. submodules: floret-kit is an -# included build. No key.properties on the buildserver, so the release build -# comes out unsigned, which is what F-Droid compares. Builds: - versionName: 1.0.0 versionCode: 10000 - commit: v1.0.0 + commit: 671910f54b097306ed83d69f910eb328cb07dc3d subdir: app submodules: true gradle: