Commit 1dcbbf14 authored by Nicolas Bruguier's avatar Nicolas Bruguier

Resync with elementary

parent 4557739d
......@@ -33,11 +33,11 @@ Package: fonts-elementary-core
Architecture: all
Depends: fonts-croscore,
fonts-croscore-config-elementary,
fonts-droid | fonts-droid-fallback,
fonts-khmer-mondulkiri-elementary,
fonts-noto,
fonts-open-sans-elementary,
fonts-open-sans-emoji-elementary,
fonts-raleway-elementary
fonts-raleway-elementary,
fonts-roboto
Pre-Depends: dpkg (>= 1.15.6)
Description: elementary essential fonts
These are fonts that elementary OS depends on.
......@@ -51,6 +51,7 @@ Depends: fonts-capture-it-elementary,
fonts-limelight-elementary,
fonts-lobster-elementary,
fonts-operating-instructions-elementary,
fonts-opendyslexic,
fonts-plainblack-elementary
# fonts-wc-roughtrad-elementary
Pre-Depends: dpkg (>= 1.15.6)
......@@ -99,13 +100,6 @@ Replaces: fonts-open-sans
Description: Some font
This is a font.
Package: fonts-open-sans-emoji-elementary
Architecture: all
Pre-Depends: dpkg (>= 1.15.6)
Conflicts: fonts-symbola-elementary
Replaces: fonts-symbola-elementary
Description: Mashup emoji font
OpenSans + AndroidEmoji + Symbola
Package: fonts-operating-instructions-elementary
Architecture: all
......@@ -128,6 +122,12 @@ Replaces: fonts-raleway
Description: Some font
This is a font.
Package: fonts-redacted-elementary
Architecture: all
Pre-Depends: dpkg (>= 1.15.6)
Description: Redacted script font
Font for concealing text.
#
# This needs to be TTF instead of ODT
#
......
open-sans-emoji/*.otf usr/share/fonts/opentype/open-sans-emoji-elementary
redacted/*.ttf usr/share/fonts/truetype/redacted-elementary
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment