On 1/1/23 23:09, Julian Gilbey wrote:
(1) As I noted earlier in this report, I was a little confused by the
current Salsa repository, but am becoming less so. There are numerous
branches there, and none of them match the current version in unstable
(they only have 1.6.50-2). I'm assuming the branch names match the
OpenStack release names (except for the debian/unstable and master
branches).
That's correct. But you don't need to care. The only thing you need to
know, is that the current default branch is the one you should push to.
Currently, that's debian/zed.
I would suggest modifying the repository into a
git-buildpackage (gbp) setup with upstream, pristine-tar and
debian/unstable branches, with debian/[openstack-code-name] branches
being used as they are currently.
There's no such thing as pristine-tar in the OpenStack packaging. The
workflow is described here:
https://wiki.debian.org/OpenStack/PackageUpdate#Import_upstream_changes_to_the_debian.2FOSRELEASE_branch
(2) You said that newer versions of MDI break Horizon. I've just
looked in some detail at python3-xstatic-mdi, which is the only
package that depends on fonts-materialdesignicons-webfont and is
maintained by the OpenStack team. Am I correct about this?
Yes.
However, we do need newer versions of MDI for other packages. (I will
discuss this with the tulip maintainers; their code seems to require
version 4.9.95 of the icons...; on the other hand, searx-admin is
fine.) So can I propose the following solution which will (all being
well!) work for both OpenStack and the other users of the MDI font:
* My version of the package in salsa currently produces the following
binary packages:
fonts-materialdesignicons-webfont - the current version of the font (7.x)
fonts-materialdesignicons-webfont-v5 - version 5.9.55 of the font
fonts-materialdesignicons-webfont-v6 - version 6.9.96 of the font
fonts-materialdesignicons-webfont-v7 - the latest version 7 of the font
These binary packages store the fonts in
/usr/share/fonts/*/materialdesignicons-webfont/ (as in the current
version of the package), and has symlinks to them in
/usr/share/fonts-materialdesignicons-webfont/fonts; the different
versions are distinguished by filename and fontname (with only the
current version being called "materialdesignicons"; the others are
called "materialdesigniconsv5" etc.).
* We would then add one further binary:
fonts-materialdesignicons-webfont-v1 - version 1.6.50 of the font
This package would provide the current contents of
/usr/share/fonts-materialdesignicons-webfont in
/usr/share/fonts-materialdesignicons-webfont/1.6.50
(including the css, scss, fonts directories). To avoid fontname
conflicts, the contents of the fonts directory would *not* be
symlinks to /usr/share/fonts but would be the actual fonts
themselves.
The only changes then required to the python-xstatic-mdi package for
this to work are to modify debianize.patch from
+BASE_DIR = '/usr/share/fonts-materialdesignicons-webfont/'
to
+BASE_DIR = '/usr/share/fonts-materialdesignicons-webfont/1.6.50/'
and to depend on fonts-materialdesignicons-webfont-v1 instead of
fonts-materialdesignicons.
I would very much prefer if this could be avoided, for example using
update-alternative (or something similar), to avoid breaking anyone
(changing the path is always disruptive). But I'm ok with this solution
if you think that's the easiest way forward.
This way, everyone will be happy (I hope!). The only small issue with
this solution is that the v1.6.50 fonts are not available in
/usr/share/fonts, but I don't think that is a problem as they are only
required by this one package (python3-xstatic-mdi), and the v1.6.50
fonts are not being provided as general-use fonts.
Maybe other people are using this package (ie: things not packaged in
Debian from simple Debian users...). You'd be breaking them. But it's
probably ok...
If you're OK with this idea, please could you either give me access to
the python-xstatic-mdi salsa repository or make these two changes
yourself once I have made the fonts-materialdesignicons-webfont
changes?
I've added you as maintainer, feel free to push directly to this repo.
Please note that on every push, packages are automatically backported to
the current stable. You may join #debian-openstack-commits to see the
build result.
(These will have to wait for node-webfont to be accepted
into unstable and then the modified fonts-materialdesngicons-webfont
changes to pass through NEW as well, though that is likely to be
quick.)
In the meantime, I'll drop a line to the tulip maintainers....
Best wishes,
Julian
Thanks Julian, for the work and contribution,
Cheers,
Thomas Goirand (zigo)
