Merge lp:~andrewsomething/ubuntu/quantal/fonts-nanum/font-config-conf-fix into lp:ubuntu/quantal/fonts-nanum

[Andrew Starr-Bochicchio]

Fix for fonts-nanum's fontconfig file. See: #1034928

[Dimitri John Ledkov (xnox)]

Still produces:

Fontconfig warning: "/etc/fonts/conf.d/90-fonts-nanum-extra.conf", line 13: Having multiple values in <test> isn't supported and may not works as expected

review: Needs Fixing

[Andrew Starr-Bochicchio (andrewsomething)]

I only had fonts-nanum installed, so I didn't realize there were warnings in fonts-nanum-extra as well. Scratching my own itch (read annoyance at seeing these warnings) here. Branch updated...

review: Needs Resubmitting

[Dimitri John Ledkov (xnox)]

Actually this will fail.

Previously it was: OR between each string. (match in any of these cases)
Now you changed it to: AND between each string (match in all of these cases simultaneously, i.e. never)

You need to copy past the match tag around each test as well.

See:
https://bugs.launchpad.net/ubuntu/+source/fonts-unfonts-core/+bug/1034928/comments/23

review: Needs Resubmitting

[Andrew Starr-Bochicchio (andrewsomething)]

Thanks for catching that. Updated.

[Marc Deslauriers (mdeslaur)]

Looks good, ACK. Uploaded to quantal. Thanks!

review: Approve

=== modified file 'debian/90-fonts-nanum-extra.conf'
--- debian/90-fonts-nanum-extra.conf	2011-10-13 00:22:03 +0000
+++ debian/90-fonts-nanum-extra.conf	2012-09-05 00:38:24 +0000
@@ -5,10 +5,60 @@
   <match target="scan">
     <test name="fullname" qual="any" compare="eq">
       <string>NanumMyeongjo ExtraBold</string>
+    </test>
+    <edit name="style" mode="assign">
+      <string>ExtraBold</string>
+    </edit>
+    <edit name="weight" mode="assign">
+      <const>extrabold</const>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname" qual="any" compare="eq">
       <string>NanumMyeongjoExtraBold</string>
+    </test>
+    <edit name="style" mode="assign">
+      <string>ExtraBold</string>
+    </edit>
+    <edit name="weight" mode="assign">
+      <const>extrabold</const>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname" qual="any" compare="eq">
       <string>나눔명조 ExtraBold</string>
+    </test>
+    <edit name="style" mode="assign">
+      <string>ExtraBold</string>
+    </edit>
+    <edit name="weight" mode="assign">
+      <const>extrabold</const>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname" qual="any" compare="eq">
       <string>NanumGothic ExtraBold</string>
+    </test>
+    <edit name="style" mode="assign">
+      <string>ExtraBold</string>
+    </edit>
+    <edit name="weight" mode="assign">
+      <const>extrabold</const>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname" qual="any" compare="eq">
       <string>NanumGothicExtraBold</string>
+    </test>
+    <edit name="style" mode="assign">
+      <string>ExtraBold</string>
+    </edit>
+    <edit name="weight" mode="assign">
+      <const>extrabold</const>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname" qual="any" compare="eq">
       <string>나눔고딕 ExtraBold</string>
     </test>
     <edit name="style" mode="assign">

=== modified file 'debian/90-fonts-nanum.conf'
--- debian/90-fonts-nanum.conf	2011-10-13 00:22:03 +0000
+++ debian/90-fonts-nanum.conf	2012-09-05 00:38:24 +0000
@@ -4,8 +4,40 @@
   <!-- workaround for wrong style and weight -->
   <match target="scan">
     <test name="fullname" qual="any" compare="eq">
-      <string>NanumMyeongjoBold</string><string>나눔명조 Bold</string>
-      <string>NanumGothicBold</string><string>나눔고딕 Bold</string>
+      <string>NanumMyeongjoBold</string>
+    </test>
+    <edit name="style" mode="assign">
+      <string>Bold</string>
+    </edit>
+    <edit name="weight" mode="assign">
+      <const>bold</const>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname" qual="any" compare="eq">
+      <string>나눔명조 Bold</string>
+    </test>
+    <edit name="style" mode="assign">
+      <string>Bold</string>
+    </edit>
+    <edit name="weight" mode="assign">
+      <const>bold</const>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname" qual="any" compare="eq">
+      <string>NanumGothicBold</string>
+    </test>
+    <edit name="style" mode="assign">
+      <string>Bold</string>
+    </edit>
+    <edit name="weight" mode="assign">
+      <const>bold</const>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname" qual="any" compare="eq">
+      <string>나눔고딕 Bold</string>
     </test>
     <edit name="style" mode="assign">
       <string>Bold</string>
@@ -16,27 +48,60 @@
   </match>
   <!-- fallback of the MS fonts -->
   <alias>
-    <family>Gulim</family><family>굴림</family>
-    <family>Dotum</family><family>돋움</family>
-    <prefer><family>NanumGothic</family></prefer>
-  </alias>
-  <alias>
-    <family>Batang</family><family>바탕</family>
+    <family>Gulim</family>
+    <prefer><family>NanumGothic</family></prefer>
+  </alias>
+  <alias>
+    <family>굴림</family>
+    <prefer><family>NanumGothic</family></prefer>
+  </alias>
+  <alias>
+    <family>Dotum</family>
+    <prefer><family>NanumGothic</family></prefer>
+  </alias>
+  <alias>
+    <family>돋움</family>
+    <prefer><family>NanumGothic</family></prefer>
+  </alias>
+  <alias>
+    <family>Batang</family>
+    <prefer><family>NanumMyeongjo</family></prefer>
+  </alias>
+  <alias>
+    <family>바탕</family>
     <prefer><family>NanumMyeongjo</family></prefer>
   </alias>
   <!-- specify fallbacks for the missing glyphs. -->
   <match target="pattern">
     <test name="family" compare="eq">
-      <string>나눔고딕</string><string>NanumGothic</string>
-    </test>
-    <edit name="family" mode="append">
-      <string>UnDotum</string>
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match target="pattern">
-    <test name="family" compare="eq">
-      <string>나눔명조</string><string>NanumMyeongjo</string>
+      <string>나눔고딕</string>
+    </test>
+    <edit name="family" mode="append">
+      <string>UnDotum</string>
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match target="pattern">
+    <test name="family" compare="eq">
+      <string>NanumGothic</string>
+    </test>
+    <edit name="family" mode="append">
+      <string>UnDotum</string>
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match target="pattern">
+    <test name="family" compare="eq">
+      <string>나눔명조</string>
+    </test>
+    <edit name="family" mode="append">
+      <string>UnBatang</string>
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
+  <match target="pattern">
+    <test name="family" compare="eq">
+      <string>NanumMyeongjo</string>
     </test>
     <edit name="family" mode="append">
       <string>UnBatang</string>

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-03 01:41:57 +0000
+++ debian/changelog	2012-09-05 00:38:24 +0000
@@ -1,3 +1,12 @@
+fonts-nanum (3.020-1ubuntu1) quantal; urgency=low
+
+  * debian/90-fonts-nanum{-extra}.conf: (LP: #1034928)
+   - Update so that there are not multiple values within
+     test tags as Fontconfig warns that this is not supported.
+  * Add Pre-Depends: dpkg (>= 1.15.6~) for xz compression.
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Tue, 04 Sep 2012 15:00:01 -0400
+
 fonts-nanum (3.020-1) unstable; urgency=low
 
   [ Changwoo Ryu ]

=== modified file 'debian/control'
--- debian/control	2012-06-03 01:41:57 +0000
+++ debian/control	2012-09-05 00:38:24 +0000
@@ -1,7 +1,8 @@
 Source: fonts-nanum
 Section: fonts
 Priority: optional
-Maintainer: Debian Fonts Task Force <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Fonts Task Force <[e-mail]>
 Uploaders: Changwoo Ryu <[e-mail]>
 Build-Depends: debhelper (>= 9),
 Standards-Version: 3.9.3
@@ -11,6 +12,7 @@
 
 Package: fonts-nanum
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends}
 Conflicts: ttf-nanum (<< 3.010-2)
 Replaces: ttf-nanum (<< 3.010-2)
@@ -25,6 +27,7 @@
 
 Package: fonts-nanum-extra
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends}
 Conflicts: ttf-nanum-extra (<< 3.010-2)
 Replaces: ttf-nanum (<< 3.010-1), ttf-nanum-extra (<< 3.010-2)
@@ -40,6 +43,7 @@
 Package: ttf-nanum
 Section: oldlibs
 Priority: extra
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: fonts-nanum, ${misc:Depends}
 Architecture: all
 Description: transitional dummy package
@@ -48,6 +52,7 @@
 Package: ttf-nanum-extra
 Section: oldlibs
 Priority: extra
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: fonts-nanum-extra, ${misc:Depends}
 Architecture: all
 Description: transitional dummy package