From af46f8979a889913d69004bbfd848f1526f19afb Mon Sep 17 00:00:00 2001 From: gerryfrancis <51095533+gerryfrancis@users.noreply.github.com> Date: Mon, 17 Jun 2024 16:22:42 +0200 Subject: [PATCH 1/3] Various corrections/updates to f-droid.md --- docs/f-droid.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/f-droid.md b/docs/f-droid.md index 8aea4fb07..192cda9c8 100644 --- a/docs/f-droid.md +++ b/docs/f-droid.md @@ -4,20 +4,19 @@ is the Delta Chat page on F-Droid.org, the F-Droid-app will show similar information. -- +- contains the description, icon, screenshots and all meta data shown for Delta Chat on F-Droid in the [fastlane format](https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#fastlane-structure). -- and - - contain [additional F-Droid-specific metadata](https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#in-the-f-droid-repo) +- + contains [additional F-Droid-specific metadata](https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#in-the-f-droid-repo) and build instructions that do not fit the fastlane format. F-Droid adds new versions automatically to the end of `.yml` file. - new versions are recognized by tags in the form `v1.2.3` - before adding tags like that, have a look at `docs/release-checklist.md` the build and distribution is expected to take - [up to 5 days](https://gitlab.com/fdroid/wiki/-/wikis/FAQ#how-long-does-it-take-for-my-app-to-show-up-on-website-and-client). + [up to 7 days](https://gitlab.com/fdroid/wiki/-/wikis/FAQ#how-long-does-it-take-for-my-app-to-show-up-on-website-and-client). # F-Droid Build status @@ -25,7 +24,7 @@ - shows F-Droid's overall build status, if Delta Chat shows up at "Need updating" or "Running", - things are working as expected :) + things are working as expected. :) - (with VERSIONCODE = 537 or so) links to successfully built apk @@ -55,8 +54,8 @@ $ ../fdroidserver/fdroid checkupdates -v com.b44t.messenger build repo as f-droid would do: $ ../froidserver/fdroid build -v com.b44t.messenger: -(via https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools/ -and https://f-droid.org/docs/Building_Applications/ - +(via +and - might require `pip install pyasn1 pyasn1_modules pyaml requests`) From 9313e8e37afee536679d2c9d3d96b73e85d9da3b Mon Sep 17 00:00:00 2001 From: gerryfrancis <51095533+gerryfrancis@users.noreply.github.com> Date: Mon, 17 Jun 2024 17:03:40 +0200 Subject: [PATCH 2/3] Further corrections/updates --- docs/f-droid.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/f-droid.md b/docs/f-droid.md index 192cda9c8..6d3d5b692 100644 --- a/docs/f-droid.md +++ b/docs/f-droid.md @@ -13,9 +13,10 @@ and build instructions that do not fit the fastlane format. F-Droid adds new versions automatically to the end of `.yml` file. -- new versions are recognized by tags in the form `v1.2.3` - - before adding tags like that, have a look at `docs/release-checklist.md` - the build and distribution is expected to take +- New versions are recognized by tags in the form `v1.2.3` - + before adding tags like that, have a look at + . + The build and distribution is expected to take [up to 7 days](https://gitlab.com/fdroid/wiki/-/wikis/FAQ#how-long-does-it-take-for-my-app-to-show-up-on-website-and-client). @@ -40,18 +41,18 @@ $ git clone https://gitlab.com/fdroid/fdroiddata $ git clone https://gitlab.com/fdroid/fdroidserver $ cd fdroiddata -now, metadata/com.b44t.messenger.yml can be modified. -for testing, one can change the repo to a branch +Now, metadata/com.b44t.messenger.yml can be modified. +For testing, one can change the repo to a branch by adding the line `Update Check Mode:RepoManifest/BRANCH` to the file. -set some path to ndk etc: +Set some path to ndk etc: $ cp ../fdroidserver/examples/config.py . # adapt file as needed -checkout repo as f-droid would do: +Checkout repo as f-droid would do: $ ../fdroidserver/fdroid checkupdates -v com.b44t.messenger (for testing with uncommitted changes, add --allow-dirty) -build repo as f-droid would do: +Build repo as f-droid would do: $ ../froidserver/fdroid build -v com.b44t.messenger: (via @@ -65,14 +66,14 @@ might require `pip install pyasn1 pyasn1_modules pyaml requests`) and `metadata/en-US/full_description.txt` in repository. -- make sure there is a "newline" at the end of the description - (see ) +- Make sure there is a "newline" at the end of the description + (see ). # Changing F-Droid metadata -- the file `com.b44t.messenger.yml` can be changed via a PR to the repository +- The file `com.b44t.messenger.yml` can be changed via a PR to the repository. -- reformat the metadata using +- Reformat the metadata using $ ../fdroidserver/fdroid rewritemeta com.b44t.messenger # called from fdroiddata dir From dc3f03c48ebe54de2a4f8b5634e4f5783475c882 Mon Sep 17 00:00:00 2001 From: gerryfrancis <51095533+gerryfrancis@users.noreply.github.com> Date: Mon, 17 Jun 2024 17:07:04 +0200 Subject: [PATCH 3/3] Update f-droid.md --- docs/f-droid.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/f-droid.md b/docs/f-droid.md index 6d3d5b692..332b7086c 100644 --- a/docs/f-droid.md +++ b/docs/f-droid.md @@ -2,7 +2,7 @@ - is the Delta Chat page on F-Droid.org, - the F-Droid-app will show similar information. + the F-Droid app will show similar information. - contains the description, icon, screenshots and all meta data shown for Delta Chat on F-Droid @@ -48,11 +48,11 @@ by adding the line `Update Check Mode:RepoManifest/BRANCH` to the file. Set some path to ndk etc: $ cp ../fdroidserver/examples/config.py . # adapt file as needed -Checkout repo as f-droid would do: +Checkout repo as F-Droid would do: $ ../fdroidserver/fdroid checkupdates -v com.b44t.messenger (for testing with uncommitted changes, add --allow-dirty) -Build repo as f-droid would do: +Build repo as F-Droid would do: $ ../froidserver/fdroid build -v com.b44t.messenger: (via