Merge ~seb128/ubuntu/+source/fonts-ubuntu:ignore-compat-symlinks into ubuntu/+source/fonts-ubuntu:ubuntu/devel

[Sebastien Bacher]

[Gunnar Hjalmarsson (gunnarhj)]

A nitpicking thing: Would be good if it could be installed in /usr/share/fontconfig/conf.avail instead of /etc/fonts/conf.avail .

[Iain Lane (laney)]

Looks good (and agreed with Gunnar). I did leave one question comment inline.

If you wanted I think you could simplify the glob expression if you installed the new fonts in a different directory, then you could `rejectfont` all of `/usr/share/fonts/truetype/ubuntu/*` in one go.

81fabd8... by Sebastien Bacher on 2023-04-11

remove invalid entry

fb76390... by Sebastien Bacher on 2023-04-11

install the fontconfig entry to /usr instead of /etc

[Sebastien Bacher (seb128)]

Thanks for the review, I pushed/uploaded with the config installed to /usr and removing the weird empty tag.

> If you wanted I think you could simplify the glob expression if you installed the new fonts in a different directory

I ignored that because moving the font would create the same upgrade issue than made us add the symlinks and do another round of hacks, it didn't feel like that was worth it

diff --git a/debian/71-ubuntulegacy.conf b/debian/71-ubuntulegacy.conf
new file mode 100644
index 0000000..7f2a5e6
--- /dev/null
+++ b/debian/71-ubuntulegacy.conf
@@ -0,0 +1,20 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<selectfont>
+    <rejectfont>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-B.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-BI.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-C.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-L.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-LI.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-M.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-MI.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-R.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-RI.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/Ubuntu-Th.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/UbuntuMono-B.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/UbuntuMono-BI.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/UbuntuMono-R.ttf</glob>
+        <glob>/usr/share/fonts/truetype/ubuntu/UbuntuMono-RI.ttf</glob>
+    </rejectfont>
+</selectfont>
diff --git a/debian/fonts-ubuntu.install b/debian/fonts-ubuntu.install
index d0e353a..3163350 100644
--- a/debian/fonts-ubuntu.install
+++ b/debian/fonts-ubuntu.install
@@ -1 +1,2 @@
 Ubuntu*.ttf    usr/share/fonts/truetype/ubuntu
+debian/71-ubuntulegacy.conf usr/share/fontconfig/conf.avail
diff --git a/debian/fonts-ubuntu.links b/debian/fonts-ubuntu.links
index f399c34..fc5d96b 100644
--- a/debian/fonts-ubuntu.links
+++ b/debian/fonts-ubuntu.links
@@ -12,4 +12,5 @@ usr/share/fonts/truetype/ubuntu/Ubuntu[wdth,wght].ttf usr/share/fonts/truetype/u
 usr/share/fonts/truetype/ubuntu/Ubuntu-Italic[wdth,wght].ttf usr/share/fonts/truetype/ubuntu/Ubuntu-RI.ttf
 usr/share/fonts/truetype/ubuntu/Ubuntu[wdth,wght].ttf usr/share/fonts/truetype/ubuntu/Ubuntu-R.ttf
 usr/share/fonts/truetype/ubuntu/Ubuntu[wdth,wght].ttf usr/share/fonts/truetype/ubuntu/Ubuntu-Th.ttf
+usr/share/fontconfig/conf.avail/71-ubuntulegacy.conf etc/fonts/conf.d/71-ubuntulegacy.conf