Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package fdroidcl
[ Reason ]
The F-Droid metadata json format changed slightly moving the App name to
the localized part. The update adds a upstream accepted patch to prefer
that over the general field in case that is empty. It is basically a
copy and paste of what is already done for the summary and description
fields in the lines below the patch.
[ Impact ]
The name of an app is not shown:
$ fdroidcl show org.fdroid.fdroid | grep "^Name"
Name :
[ Tests ]
I tested the change manually.
[ Risks ]
Code change is trivial and popcon is low.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock fdroidcl/0.5.0-3
diff --git a/debian/changelog b/debian/changelog
index a061ba6..d52170b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fdroidcl (0.5.0-3) unstable; urgency=medium
+
+ * Add patch in case the app name is empty
+
+ -- Jochen Sprickerhof <jspri...@debian.org> Fri, 23 Apr 2021 18:42:52 +0200
+
fdroidcl (0.5.0-2) unstable; urgency=medium
* bump policy and debhelper versions
diff --git
a/debian/patches/0002-Use-English-app-name-if-the-other-is-empty.patch
b/debian/patches/0002-Use-English-app-name-if-the-other-is-empty.patch
new file mode 100644
index 0000000..2dc860a
--- /dev/null
+++ b/debian/patches/0002-Use-English-app-name-if-the-other-is-empty.patch
@@ -0,0 +1,30 @@
+From: Jochen Sprickerhof <jspri...@debian.org>
+Date: Fri, 23 Apr 2021 18:34:00 +0200
+Subject: Use English app name if the other is empty
+
+---
+ fdroid/index.go | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/fdroid/index.go b/fdroid/index.go
+index 1716c19..119ea7e 100644
+--- a/fdroid/index.go
++++ b/fdroid/index.go
+@@ -59,6 +59,7 @@ type App struct {
+ }
+
+ type Localization struct {
++ Name string `json:"name"`
+ Summary string `json:"summary"`
+ Description string `json:"description"`
+ }
+@@ -274,6 +275,9 @@ func LoadIndexJSON(r io.Reader) (*Index, error) {
+ english, enOK = app.Localized["en-US"]
+ }
+
++ if app.Name == "" && enOK {
++ app.Name = english.Name
++ }
+ // TODO: why does the json index contain html escapes?
+ app.Name = html.UnescapeString(app.Name)
+
diff --git a/debian/patches/series b/debian/patches/series
index 0890fce..08f194a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Drop-main_test.go.patch
+0002-Use-English-app-name-if-the-other-is-empty.patch
