Merge lp:~mitya57/ubuntu/trusty/fonts-unfonts-core/sync-with-debian into lp:ubuntu/trusty/fonts-unfonts-core

[Dmitry Shachnev]

This is a (fake) sync with Debian, the only remaining change is a version bump from 1.0.2-something to 1.0.3.is.1.0.2-something.

[Martin Pitt (pitti)]

Thanks! Uploaded.

review: Approve

=== modified file 'debian/90-fonts-unfonts-core.conf'
--- debian/90-fonts-unfonts-core.conf	2012-09-04 16:18:03 +0000
+++ debian/90-fonts-unfonts-core.conf	2014-01-15 12:11:53 +0000
@@ -1,94 +1,52 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>은 바탕</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>UnBatang</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>은 돋움</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>UnDotum</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>은 궁서</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>UnGungseo</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>은 필기</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>UnPilgi</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>은 그래픽</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
-	<match target="font">
-		<test name="family" qual="any">
-			<string>UnGraphic</string>
-		</test>
-		<edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
-  		<edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
-  		<edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
-	</match>
+  <!-- Un fonts have no hint instructions so they rely on autohint and
+       antialias. Note that they might look horrible with some
+       autohint configuration. -->
+  <match target="font">
+    <test name="family" qual="any">
+      <string>UnBatang</string>
+    </test>
+    <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
+    <edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
+  </match>
+  <match target="font">
+    <test name="family" qual="any">
+      <string>UnDotum</string>
+    </test>
+    <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
+    <edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
+  </match>
+  <match target="font">
+    <test name="family" qual="any">
+      <string>UnGungseo</string>
+    </test>
+    <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
+    <edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
+  </match>
+  <match target="font">
+    <test name="family" qual="any">
+      <string>UnPilgi</string>
+    </test>
+    <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
+    <edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
+  </match>
+  <match target="font">
+    <test name="family" qual="any">
+      <string>UnGraphic</string>
+    </test>
+    <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hinting"   mode="assign" binding="strong"><bool>false</bool></edit>
+    <edit name="autohint"  mode="assign" binding="strong"><bool>true</bool></edit>
+    <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
+  </match>
 </fontconfig>

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2011-10-10 12:37:52 +0000
+++ debian/README.Debian	2014-01-15 12:11:53 +0000
@@ -10,7 +10,10 @@
 these fonts.
 
 This licensing problem has already been reported to the upstream years
-ago but the upstream is not active on this discussion.
+ago but the upstream was not active on this discussion. Currently the
+upstream looks dead.
+
+For your information about this issue:
 
 * The font embedding exception which FSF suggests:
   http://www.fsf.org/licensing/licenses/gpl-faq.html#FontException
@@ -25,7 +28,5 @@
 
   http://faq.ktug.or.kr/faq/%C0%BA%B1%DB%B2%C3
 
-  http://chem.skku.ac.kr/~kle/main/%C0%BA%B1%DB%B2%C3
-
-
- -- Changwoo Ryu <[e-mail]>, Tue, 14 Oct 2008 23:40:20 +0900
+
+ -- Changwoo Ryu <[e-mail]>, Wed, 30 May 2012 01:36:35 +0900

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-20 19:30:12 +0000
+++ debian/changelog	2014-01-15 12:11:53 +0000
@@ -1,3 +1,75 @@
+fonts-unfonts-core (1.0.3.is.1.0.2-080608-10ubuntu1) trusty; urgency=low
+
+  * Sync with Debian, the only remaining change is version bump.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 15 Jan 2014 16:07:02 +0400
+
+fonts-unfonts-core (1.0.2-080608-10) unstable; urgency=medium
+
+  * Team upload.
+  * debian/control
+    - set Standards-Version: 3.9.5
+    - set "Multi-Arch: foreign" (Closes: #705179)
+
+ -- Hideki Yamane <[e-mail]>  Mon, 13 Jan 2014 23:32:19 +0900
+
+fonts-unfonts-core (1.0.2-080608-9) unstable; urgency=low
+
+  [ Changwoo Ryu ]
+  * Do not install debian/gbp.conf (Closes: #703767)
+
+ -- Changwoo Ryu <[e-mail]>  Wed, 27 Mar 2013 01:03:04 +0900
+
+fonts-unfonts-core (1.0.2-080608-8) unstable; urgency=low
+
+  [ Changwoo Ryu ]
+  * Simplify fontconfig config
+  * Build-Depends on dpkg >= 1.16.2 for dpkg-deb -Sextreme option
+  * Fix lintian errors
+    - Use Breaks instead of Conflicts
+    - ttf-unfonts-core Depends on dpkg (>= 1.15.6~)
+  * Standards-Version: 3.9.4
+  * Add git-buildpackage config
+
+ -- Changwoo Ryu <[e-mail]>  Sat, 23 Mar 2013 04:47:16 +0900
+
+fonts-unfonts-core (1.0.2-080608-7) unstable; urgency=low
+
+  [ Changwoo Ryu ]
+  * debian/control
+    - Move to git (Closes: #689209)
+  * debian/compat, debian/control
+    - Use debhelper 9
+  * debian/copyright
+    - Use the copyright format 1.0
+  * debian/README.Debian
+    - Update to more recent information and remove obsolete URL
+  * Add more xz compress options to dh_builddeb
+    - it requires Pre-Depends: dpkg (>= 1.15.6~)
+  * Move debian/foo to debian/fonts-unfonts-core.foo
+  * Use maintscript support in dh_installdeb. (Closes: #689108)
+    - {mv,rm}_conffile requires Pre-Depends: dpkg (>= 1.15.7.2)
+
+  [ Andrew Starr-Bochicchio ]
+  * debian/90-fonts-unfonts-core.conf:
+   - Update so that there are not multiple values within test tags as
+    Fontconfig warns that this is not supported. (Closes: #686698)
+
+ -- Changwoo Ryu <[e-mail]>  Sat, 06 Oct 2012 19:54:41 +0900
+
+fonts-unfonts-core (1.0.2-080608-6) unstable; urgency=low
+
+  [ Changwoo Ryu ]
+  * Set the priority of ttf-* package as extra
+
+  [ Hideki Yamane ]
+  * debian/rules
+    - use override_dh_builddeb to compress package with xz
+  * debian/control
+    - set "Standards-Version: 3.9.3" with no change
+
+ -- Hideki Yamane <[e-mail]>  Thu, 24 May 2012 16:26:03 +0900
+
 fonts-unfonts-core (1.0.3.is.1.0.2-080608-5ubuntu3) raring; urgency=low
 
   * Mark package Multi-Arch: foreign (LP: #1123710)

=== modified file 'debian/compat'
--- debian/compat	2011-10-10 12:37:52 +0000
+++ debian/compat	2014-01-15 12:11:53 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2013-03-20 19:30:12 +0000
+++ debian/control	2014-01-15 12:11:53 +0000
@@ -4,18 +4,20 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian Fonts Task Force <[e-mail]>
 Uploaders: Changwoo Ryu <[e-mail]>, Hideki Yamane <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9),
+               dpkg (>= 1.16.2),
+Standards-Version: 3.9.5
 Homepage: http://kldp.net/projects/unfonts
-Vcs-Svn: svn://svn.debian.org/svn/pkg-fonts/packages/fonts-unfonts-core/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-fonts/packages/fonts-unfonts-core/
+Vcs-Git: git://anonscm.debian.org/pkg-fonts/fonts-unfonts-core.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-fonts/fonts-unfonts-core.git
 
 Package: fonts-unfonts-core
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.7.2)
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Conflicts: ttf-unfonts (<< 1.0.3.is.1.0.1-0ubuntu1), ttf-unfonts-core (<< 1.0.3.is.1.0.1-0ubuntu1)
-Replaces: ttf-unfonts (<< 1.0.3.is.1.0.1-0ubuntu1), ttf-unfonts-core (<< 1.0.3.is.1.0.1-0ubuntu1)
+Breaks: ttf-unfonts (<< 1.0.1-7), ttf-unfonts-core (<< 1.0.2-080608-4)
+Replaces: ttf-unfonts (<< 1.0.1-7), ttf-unfonts-core (<< 1.0.2-080608-4)
 Description: Un series Korean TrueType fonts
  This is a set of Korean TrueType fonts.  These fonts were made from
  the HLaTeX's PostScript fonts and modified slightly.
@@ -26,9 +28,10 @@
 
 Package: ttf-unfonts-core
 Section: oldlibs
+Priority: extra
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: fonts-unfonts-core, ${misc:Depends}
 Architecture: all
-Multi-Arch: foreign
 Description: transitional dummy package
  This package is a dummy transitional package. It can be safely removed.
 

=== modified file 'debian/copyright'
--- debian/copyright	2011-10-10 12:37:52 +0000
+++ debian/copyright	2014-01-15 12:11:53 +0000
@@ -1,18 +1,17 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: un-fonts
-Maintainer: Park, Won-kyu <[e-mail]>
-            Jungshik Shin <[e-mail]>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: un-fonts
+Upstream-Contact: http://kldp.net/projects/unfonts
 Source: http://kldp.net/projects/unfonts
 
 Files: *
 Copyright: 1998-2008, Koaunghi Un
-           2003, Park, Won-kyu <[e-mail]>
-           Jungshik Shin <[e-mail]>
+           2003 Park, Won-kyu <[e-mail]>
+           2003, Jungshik Shin <[e-mail]>
 License: GPL-2
- see "/usr/share/common-licenses/GPL-2"
+ See /usr/share/common-licenses/GPL-2 for the full license.
 
 Files: debian/*
-Copyright: 2003-2010, Changwoo Ryu <[e-mail]>
-           2010, Hideki Yamane (Debian-JP) <[e-mail]>
+Copyright: 2003-2012, Changwoo Ryu <[e-mail]>
+           2010-2012, Hideki Yamane (Debian-JP) <[e-mail]>
 License: GPL-2
- see "/usr/share/common-licenses/GPL-2"
+ See /usr/share/common-licenses/GPL-2 for the full license.

=== added file 'debian/fonts-unfonts-core.install'
--- debian/fonts-unfonts-core.install	1970-01-01 00:00:00 +0000
+++ debian/fonts-unfonts-core.install	2014-01-15 12:11:53 +0000
@@ -0,0 +1,2 @@
+*.ttf usr/share/fonts/truetype/unfonts-core/
+debian/90-fonts-unfonts-core.conf etc/fonts/conf.avail/

=== added file 'debian/fonts-unfonts-core.links'
--- debian/fonts-unfonts-core.links	1970-01-01 00:00:00 +0000
+++ debian/fonts-unfonts-core.links	2014-01-15 12:11:53 +0000
@@ -0,0 +1,1 @@
+etc/fonts/conf.avail/90-fonts-unfonts-core.conf etc/fonts/conf.d/90-fonts-unfonts-core.conf 

=== added file 'debian/fonts-unfonts-core.maintscript'
--- debian/fonts-unfonts-core.maintscript	1970-01-01 00:00:00 +0000
+++ debian/fonts-unfonts-core.maintscript	2014-01-15 12:11:53 +0000
@@ -0,0 +1,6 @@
+# dropping defoma
+rm_conffile /etc/defoma/hints/ttf-unfonts-core.hints 1.0.2-080608-1~ ttf-unfonts-core
+# ttf- to fonts-
+rm_conffile /etc/fonts/conf.avail/90-ttf-unfonts-core.conf 1.0.2-080608-4~ ttf-unfonts-core
+# incorrectly installed
+rm_conffile /etc/fonts/conf.avail/gbp.conf 1.0.2-080608-9~ fonts-unfonts-core

=== added file 'debian/gbp.conf'
--- debian/gbp.conf	1970-01-01 00:00:00 +0000
+++ debian/gbp.conf	2014-01-15 12:11:53 +0000
@@ -0,0 +1,4 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = master
+upstream-branch = upstream

=== removed file 'debian/install'
--- debian/install	2011-10-10 12:37:52 +0000
+++ debian/install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-*.ttf usr/share/fonts/truetype/unfonts-core/
-debian/*.conf etc/fonts/conf.avail/

=== removed file 'debian/links'
--- debian/links	2011-10-12 23:18:55 +0000
+++ debian/links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/fonts/conf.avail/90-fonts-unfonts-core.conf etc/fonts/conf.d/90-fonts-unfonts-core.conf 

=== removed file 'debian/preinst'
--- debian/preinst	2011-10-12 23:18:55 +0000
+++ debian/preinst	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm_conffile() {
-  PKGNAME="$1"
-  CONFFILE="$2"
-  if [ -e "$CONFFILE" ]; then
-   md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-   old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
-   if [ "$md5sum" != "$old_md5sum" ]; then
-     echo "Obsolete conffile $CONFFILE has been modified by you."
-     echo "Saving as $CONFFILE.dpkg-bak ..."
-     mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-   else
-     echo "Removing obsolete conffile $CONFFILE ..."
-     rm -f "$CONFFILE"
-   fi
- fi
-}
-
-case "$1" in
-install|upgrade)
-  if dpkg --compare-versions "$2" lt-nl "20090104-5"; then
-      PKG="ttf-unfonts-core"
-      FILE="/etc/defoma/hints/${PKG}.hints"
-      if [ -f $FILE ]; then
-          if [ -x /usr/bin/defoma-font ]; then
-	      defoma-font purge-all $FILE || true
-	  fi
-      fi
-    rm_conffile $PKG $FILE
-  fi
-
-  PKG="ttf-unfonts-core"
-  OLD_CONF_FILE="/etc/fonts/conf.avail/90-${PKG}.conf"
-  if [ -f $OLD_CONF_FILE ]; then
-      rm $OLD_CONF_FILE
-  fi
-esac
-
-#DEBHELPER#
-exit 0

=== modified file 'debian/rules'
--- debian/rules	2011-10-10 12:37:52 +0000
+++ debian/rules	2014-01-15 12:11:53 +0000
@@ -4,3 +4,5 @@
 %:
 	dh $@
 
+override_dh_builddeb:
+	dh_builddeb -- -Zxz -Sextreme -z9