14 files changed, 77 insertions, 17 deletions
diff --git a/debian/90-use-karmilla-for-karla.conf b/debian/90-use-karla-for-karmilla.conf
index 89460c3..169fe89 100644
--- a/debian/90-use-karmilla-for-karla.conf
+++ b/debian/90-use-karla-for-karmilla.conf
@@ -3,8 +3,8 @@
 <fontconfig>
 
     <alias binding="same">
-        <family>Karla</family>
-        <prefer><family>Karmilla</family></prefer>
+        <family>Karmilla</family>
+        <prefer><family>Karla</family></prefer>
     </alias>
 
 </fontconfig>
diff --git a/debian/changelog b/debian/changelog
index f241c71..ca81ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+fonts-karmilla (016+git20201120+1ee314b604eb-3) unstable; urgency=medium
+
+  * Clean generated files (Closes: #1044829).
+
+ -- Andrej Shadura <andrewsh@debian.org>  Wed, 30 Aug 2023 16:20:30 +0200
+
+fonts-karmilla (016+git20201120+1ee314b604eb-2) unstable; urgency=medium
+
+  * Install the correct file.
+
+ -- Andrej Shadura <andrewsh@debian.org>  Wed, 30 Aug 2023 16:18:07 +0200
+
+fonts-karmilla (016+git20201120+1ee314b604eb-1) unstable; urgency=medium
+
+  * New upstream snapshot:
+    * Improve bold even further
+    * Add a very basic schwa; probably needs to be adjusted a bit
+    * Add an alternative acute (for Polish) and a bolder Hungarian umlaut
+    * Add Polish Ó/ó
+    * Add appropriate substitutions for Polish.
+  * Prefer Karla instead of Karmilla.
+    Karla has improved most glyphs and is now superior to Karmilla except
+    for Cyrillic which it still lacks.
+
+ -- Andrej Shadura <andrewsh@debian.org>  Wed, 30 Aug 2023 15:41:26 +0200
+
+fonts-karmilla (016+git20201117+85100cc-2) unstable; urgency=medium
+
+  * Fix install file paths.
+
+ -- Andrej Shadura <andrewsh@debian.org>  Wed, 18 Nov 2020 21:15:35 +0100
+
 fonts-karmilla (016+git20201117+85100cc-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/clean b/debian/clean
index 7a0203d..8c4181f 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,2 @@
-src/*.ttf
-src/*.png
+sources/*.ttf
+sources/*.png
diff --git a/debian/control b/debian/control
index 9cf343d..9bd94a0 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Package: fonts-karmilla
 Architecture: all
 Depends:
  ${misc:Depends},
+Recommends: fonts-karla
 Multi-Arch: foreign
 Description: Grotesque Sans Serif Latin typeface, extended
  Karmilla is a grotesque sans serif typeface family that supports languages
diff --git a/debian/install b/debian/install
index c609931..96e5d2a 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
-debian/90-use-karmilla-for-karla.conf usr/share/fontconfig/conf.avail
+debian/90-*.conf usr/share/fontconfig/conf.avail
 sources/*.ttf usr/share/fonts/truetype/karmilla
diff --git a/sources/Karmilla-Bold.sfdir/_Oacute.alt.glyph b/sources/Karmilla-Bold.sfdir/_Oacute.alt.glyph
new file mode 100644
index 0000000..4cdbb8e
--- /dev/null
+++ b/sources/Karmilla-Bold.sfdir/_Oacute.alt.glyph
@@ -0,0 +1,8 @@
+StartChar: Oacute.alt
+Encoding: 1114156 -1 500
+Width: 683
+LayerCount: 2
+Fore
+Refer: 498 -1 S 1 0 0 1 300.5 76 2
+Refer: 52 79 N 1 0 0 1 0 0 3
+EndChar
diff --git a/sources/Karmilla-Bold.sfdir/_Oacute.glyph b/sources/Karmilla-Bold.sfdir/_Oacute.glyph
index e7ee57f..88824db 100644
--- a/sources/Karmilla-Bold.sfdir/_Oacute.glyph
+++ b/sources/Karmilla-Bold.sfdir/_Oacute.glyph
@@ -5,4 +5,5 @@ LayerCount: 2
 Fore
 Refer: 97 180 S 1 0 0 1 168.5 28 2
 Refer: 52 79 N 1 0 0 1 0 0 3
+Substitution2: "Polish letters" Oacute.alt
 EndChar
diff --git a/sources/Karmilla-Bold.sfdir/acute.alt.glyph b/sources/Karmilla-Bold.sfdir/acute.alt.glyph
new file mode 100644
index 0000000..a298866
--- /dev/null
+++ b/sources/Karmilla-Bold.sfdir/acute.alt.glyph
@@ -0,0 +1,8 @@
+StartChar: acute.alt
+Encoding: 1114154 -1 498
+Width: 356
+Flags: W
+LayerCount: 2
+Fore
+Refer: 97 180 N 0.707107 0.707107 -0.707107 0.707107 611.31 98.0248 2
+EndChar
diff --git a/sources/Karmilla-Bold.sfdir/acute.glyph b/sources/Karmilla-Bold.sfdir/acute.glyph
index 10dda8b..2c76cdc 100644
--- a/sources/Karmilla-Bold.sfdir/acute.glyph
+++ b/sources/Karmilla-Bold.sfdir/acute.glyph
@@ -11,4 +11,5 @@ SplineSet
  53 694 l 1,3,-1
  23 768 l 1,0,-1
 EndSplineSet
+Substitution2: "Polish letters" acute.alt
 EndChar
diff --git a/sources/Karmilla-Bold.sfdir/font.props b/sources/Karmilla-Bold.sfdir/font.props
index ccc4f80..266084e 100644
--- a/sources/Karmilla-Bold.sfdir/font.props
+++ b/sources/Karmilla-Bold.sfdir/font.props
@@ -54,6 +54,7 @@ OS2StrikeYPos: 250
 OS2Vendor: 'pyrs'
 OS2CodePages: 00000001.00000000
 OS2UnicodeRanges: 80000027.08000042.14000000.00000000
+Lookup: 1 0 0 "Polish letters" { "Polish letters"  } ['locl' ('DFLT' <'dflt' > 'latn' <'PLK ' > ) ]
 Lookup: 1 0 0 "'onum' Oldstyle Figures in Latin lookup 0" { "'onum' Oldstyle Figures in Latin lookup 0 subtable" ("oldstyle") } ['onum' ('latn' <'dflt' > ) ]
 Lookup: 258 0 0 "'kern' Horizontal Kerning in Latin lookup 0" { "'kern' Horizontal Kerning in Latin lookup 0 subtable"  } ['kern' ('latn' <'dflt' > ) ]
 MarkAttachClasses: 1
diff --git a/sources/Karmilla-Bold.sfdir/hungarumlaut.glyph b/sources/Karmilla-Bold.sfdir/hungarumlaut.glyph
index b3e0697..b7c8441 100644
--- a/sources/Karmilla-Bold.sfdir/hungarumlaut.glyph
+++ b/sources/Karmilla-Bold.sfdir/hungarumlaut.glyph
@@ -4,16 +4,6 @@ Width: 422
 Flags: W
 LayerCount: 2
 Fore
-SplineSet
-36 655 m 1,4,-1
- 153 899 l 1,5,-1
- 219 860 l 1,6,-1
- 84 627 l 1,7,-1
- 36 655 l 1,4,-1
-203 655 m 1,0,-1
- 320 899 l 1,1,-1
- 386 860 l 1,2,-1
- 251 627 l 1,3,-1
- 203 655 l 1,0,-1
-EndSplineSet
+Refer: 498 -1 N 1 0 0 1 120 -12 2
+Refer: 498 -1 N 1 0 0 1 -59 -14 2
 EndChar
diff --git a/sources/Karmilla-Bold.sfdir/oacute.alt.glyph b/sources/Karmilla-Bold.sfdir/oacute.alt.glyph
new file mode 100644
index 0000000..4df8b10
--- /dev/null
+++ b/sources/Karmilla-Bold.sfdir/oacute.alt.glyph
@@ -0,0 +1,9 @@
+StartChar: oacute.alt
+Encoding: 1114155 -1 499
+Width: 566
+Flags: W
+LayerCount: 2
+Fore
+Refer: 498 -1 N 1 0 0 1 197.5 -88 2
+Refer: 26 111 N 1 0 0 1 0 0 3
+EndChar
diff --git a/sources/Karmilla-Bold.sfdir/oacute.glyph b/sources/Karmilla-Bold.sfdir/oacute.glyph
index ce705f9..b000d7d 100644
--- a/sources/Karmilla-Bold.sfdir/oacute.glyph
+++ b/sources/Karmilla-Bold.sfdir/oacute.glyph
@@ -5,4 +5,5 @@ LayerCount: 2
 Fore
 Refer: 97 180 N 1 0 0 1 108.5 -135 2
 Refer: 26 111 N 1 0 0 1 0 0 3
+Substitution2: "Polish letters" oacute.alt
 EndChar
diff --git a/sources/Karmilla-Bold.sfdir/uni01DD.glyph b/sources/Karmilla-Bold.sfdir/uni01DD.glyph
new file mode 100644
index 0000000..5f773f4
--- /dev/null
+++ b/sources/Karmilla-Bold.sfdir/uni01DD.glyph
@@ -0,0 +1,8 @@
+StartChar: uni01DD
+Encoding: 477 477 328
+Width: 514
+Flags: WO
+LayerCount: 2
+Fore
+Refer: 16 101 N -1 0 0 -1 498.23 485 2
+EndChar