Merge branch 'upstream' into tizen

Change-Id: I42d85a08a6a8438cbdaae0be87bef1aa957b6ed2

diff --combined fonts.conf.in
index 7991405,44a4484..01e2f0d
--- 1/fonts.conf.in
--- 2/fonts.conf.in
+++ b/fonts.conf.in
@@@ -1,11 -1,7 +1,7 @@@
  <?xml version="1.0"?>
- <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+ <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
  <!-- /etc/fonts/fonts.conf file to configure system font access -->
  <fontconfig>
-       <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-               <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-       </its:rules>
- 
        <description>Default configuration file</description>
  
  <!--
@@@ -16,8 -12,8 +12,8 @@@
        The intent of this standard configuration file is to be adequate for
        most environments.  If you have a reasonably normal environment and
        have found problems with this configuration, they are probably
-       things that others will also want fixed.  Please submit any
-       problems to the fontconfig bugzilla system located at fontconfig.org
+       things that others will also want fixed.  Please submit any problems
+       to the fontconfig issue tracking system located at fontconfig.org
  
        Note that the normal 'make install' procedure for fontconfig is to
        replace any existing fonts.conf file with the new version.  Place
@@@ -28,11 -24,11 +24,11 @@@
  
  <!-- Font directory list -->
  
-       <dir>@FC_DEFAULT_FONTS@</dir>
+ @FC_DEFAULT_FONTS@
        @FC_FONTPATH@
        <dir prefix="xdg">fonts</dir>
        <!-- the following element will be removed in the future -->
 -      <dir>~/.fonts</dir>
 +      <dir>~/share/fonts</dir>
  
  <!--
    Accept deprecated 'mono' alias, replacing it with 'monospace'
@@@ -69,6 -65,17 +65,17 @@@
                        <string>sans-serif</string>
                </edit>
        </match>
+ <!--
+   Accept alternate 'system ui' spelling, replacing it with 'system-ui'
+ -->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>system ui</string>
+               </test>
+               <edit name="family" mode="assign" binding="same">
+                       <string>system-ui</string>
+               </edit>
+       </match>
  
  <!--
    Load local system customization file
@@@ -80,7 -87,7 +87,7 @@@
        <cachedir>@FC_CACHEDIR@</cachedir>
        <cachedir prefix="xdg">fontconfig</cachedir>
        <!-- the following element will be removed in the future -->
 -      <cachedir>~/.fontconfig</cachedir>
 +      <cachedir>~/.cache/fontconfig</cachedir>
  
        <config>
  <!--