Merge lp:~alexeyten/elementaryos/elementary-fonts into lp:~elementary-design/elementaryos/elementary-fonts

[Alexey Ten (Lynn)]

[lp:~alexeyten/elementaryos/elementary-fonts]

26. By Alexey Ten (Lynn) on 2016-12-17

Fix lintian warnings

27. By Alexey Ten (Lynn) on 2016-12-17

Fix typos in 31-croscore-elementary.conf

28. By Alexey Ten (Lynn) on 2016-12-17

Move 31-croscore-elementary.conf to conf.avail and symlink it in conf.d

[Cody Garver (codygarver)]

Thanks for the submission, looks good.

Sorry the debian package descriptions are so lazy...

review: Approve

=== modified file '31-croscore-elementary.conf'
--- 31-croscore-elementary.conf	2015-04-13 23:07:32 +0000
+++ 31-croscore-elementary.conf	2016-12-17 10:20:33 +0000
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
-    <!-- The sans-serif font should be Tinos -->
+    <!-- The serif font should be Tinos -->
     <match target="pattern">
         <test qual="any" name="family">
             <string>serif</string>
@@ -31,7 +31,7 @@
     <!-- The sans-serif font should be Arimo -->
     <match target="pattern">
         <test qual="any" name="family">
-            <string>sans serif</string>
+            <string>sans-serif</string>
         </test>
         <edit name="family" mode="assign">
             <string>Arimo</string>

=== modified file 'debian/control'
--- debian/control	2016-06-02 19:30:04 +0000
+++ debian/control	2016-12-17 10:20:33 +0000
@@ -7,6 +7,7 @@
 
 Package: fonts-capture-it-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-capture-it
 Description: Some font
  This is a font.
@@ -15,6 +16,7 @@
 Depends: fonts-croscore
 Enhances: fonts-croscore
 Architecture: all
+Multi-Arch: foreign
 Description: Map open-source Croscore fonts to MS fonts
  A font config that maps metrically compatible open-source fonts
  Arimo (sans-serif), Tinos (serif) and Cousine (monospace) to
@@ -22,12 +24,14 @@
 
 Package: fonts-daniel-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-daniel
 Description: Some font
  This is a font.
 
 Package: fonts-elementary-core
 Architecture: all
+Multi-Arch: foreign
 Conflicts: fonts-droid
 Replaces: fonts-droid
 Depends: fonts-croscore,
@@ -38,11 +42,12 @@
          fonts-roboto,
          fonts-roboto-mono-elementary,
          fonts-sil-mondulkiri
-Description: elementary essential fonts
+Description: elementary essential fonts (dependency package)
  These are fonts that elementary OS depends on.
 
 Package: fonts-elementary-extra
 Architecture: all
+Multi-Arch: foreign
 Depends: fonts-capture-it-elementary,
          fonts-daniel-elementary,
          fonts-hvd-bodedo-elementary,
@@ -54,76 +59,90 @@
          fonts-plainblack-elementary,
          fonts-redacted-elementary
 #          fonts-wc-roughtrad-elementary
-Description: elementary featured fonts
+Description: elementary featured fonts (dependency package)
  These are fonts that elementary likes.
 
 Package: fonts-hvd-bodedo-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-hvd-bodedo
 Description: Some font
  This is a font.
 
 Package: fonts-jenna-sue-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-jenna-sue
 Description: Some font
  This is a font.
 
 Package: fonts-khmer-mondulkiri-elementary
+Section: oldlibs
 Architecture: all
+Multi-Arch: foreign
 Depends: fonts-sil-mondulkiri
 Description: Dummy transitional package
  Dummy transitional package, safe to remove.
 
 Package: fonts-limelight-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-limelight
 Description: Some font
  This is a font.
 
 Package: fonts-lobster-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-lobster
 Description: Some font
  This is a font.
 
 Package: fonts-open-sans-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-open-sans
 Description: Some font
  This is a font.
 
 Package: fonts-open-sans-emoji-elementary
+Section: oldlibs
 Architecture: all
+Multi-Arch: foreign
 Depends: fonts-noto
 Description: Dummy transitional package
  Dummy transitional package, safe to remove.
 
 Package: fonts-operating-instructions-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-operating-instructions
 Description: Some font
  This is a font.
 
 Package: fonts-plainblack-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-plainblack
 Description: Some font
  This is a font.
 
 Package: fonts-raleway-elementary
 Architecture: all
+Multi-Arch: foreign
 Replaces: fonts-raleway
 Description: Some font
  This is a font.
 
 Package: fonts-redacted-elementary
 Architecture: all
+Multi-Arch: foreign
 Description: Redacted script font
  Font for concealing text.
 
 Package: fonts-roboto-mono-elementary
 Architecture: all
+Multi-Arch: foreign
 Description: Monospaced addition to the Roboto type family
  Roboto Mono gives special consideration to glyphs
  important for reading and writing software source code.
@@ -133,5 +152,6 @@
 #
 # Package: fonts-wc-roughtrad-elementary
 # Architecture: all
+# Multi-Arch: foreign
 # Description: Some font
 #  This is a font.

=== modified file 'debian/fonts-croscore-config-elementary.install'
--- debian/fonts-croscore-config-elementary.install	2015-04-13 23:07:32 +0000
+++ debian/fonts-croscore-config-elementary.install	2016-12-17 10:20:33 +0000
@@ -1,1 +1,1 @@
-31-croscore-elementary.conf /etc/fonts/conf.d
+31-croscore-elementary.conf /etc/fonts/conf.avail

=== added file 'debian/fonts-croscore-config-elementary.links'
--- debian/fonts-croscore-config-elementary.links	1970-01-01 00:00:00 +0000
+++ debian/fonts-croscore-config-elementary.links	2016-12-17 10:20:33 +0000
@@ -0,0 +1,1 @@
+/etc/fonts/conf.avail/31-croscore-elementary.conf /etc/fonts/conf.d/31-croscore-elementary.conf