diff -pruN 1.0.1-7/debian/changelog 1.0.1-7ubuntu1/debian/changelog --- 1.0.1-7/debian/changelog 2008-05-30 15:48:59.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/changelog 2008-05-30 15:07:30.000000000 +0100 @@ -1,3 +1,11 @@ +ttf-unfonts (1.0.1-7ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - ttf-unfonts-core only contains UnBatang* and UnDotum* fonts. + - ttf-unfonts-extra contains all other fonts + + -- Arne Goetje Mon, 04 Feb 2008 22:47:43 +0000 + ttf-unfonts (1.0.1-7) unstable; urgency=low * Split to two binary packages (ttf-unfonts-core and ttf-unfonts-extra) @@ -10,6 +18,14 @@ ttf-unfonts (1.0.1-7) unstable; urgency= -- Changwoo Ryu Thu, 24 Jan 2008 09:21:19 +0900 +ttf-unfonts (1.0.1-6ubuntu1) gutsy; urgency=low + + * split the package into -core and -extra + * -core contains UnBatang* and UnDotum* + * -extra contains the other font families. + + -- Arne Goetje Wed, 19 Sep 2007 14:49:58 +0800 + ttf-unfonts (1.0.1-6) unstable; urgency=low * Applied fontforge option syntax change, -script instead of --script. diff -pruN 1.0.1-7/debian/control 1.0.1-7ubuntu1/debian/control --- 1.0.1-7/debian/control 2008-05-30 15:48:59.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/control 2008-05-30 15:07:30.000000000 +0100 @@ -1,7 +1,9 @@ Source: ttf-unfonts Section: x11 Priority: optional -Maintainer: Changwoo Ryu +Maintainer: Ubuntu MOTU Developers +Changed-By: Arne Goetje +XSBC-Original-Maintainer: Changwoo Ryu Build-Depends-Indep: defoma, fontforge (>= 0.0.20070501-1) Build-Depends: debhelper Standards-Version: 3.7.3 @@ -10,30 +12,36 @@ Homepage: http://kldp.net/projects/unfon Package: ttf-unfonts Architecture: all Depends: ttf-unfonts-core, ttf-unfonts-extra -Description: Transitional package - This is a transitional dummy package. +Conflicts: ttf-unfonts (<< 1.0.1-6ubuntu1) +Replaces: ttf-unfonts (<< 1.0.1-6ubuntu1) +Description: Metapackage to pull in -core and -extra + This is a set of Korean TrueType fonts. These fonts were made from + the HLaTeX's PostScript fonts and modified slightly. + . + They include 7 families of Korean fonts. + . + Use this package if you want to have all fonts installed. Package: ttf-unfonts-core Architecture: all Depends: defoma -Conflicts: ttf-unfonts (<< 1.0.1-7) -Replaces: ttf-unfonts (<< 1.0.1-7) +Conflicts: ttf-unfonts (<< 1.0.1-6ubuntu1) +Replaces: ttf-unfonts (<< 1.0.1-6ubuntu1) 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. . - This package has only the most common font families (UnBatang, UnDotum, - Ungraphic, Unpilgi, and UnGungseo). Install ttf-unfonts-extra for - additional fonts. + This package only includes the UnBatang and UnDotum fonts. For additional + fonts, please install the -extra package. Package: ttf-unfonts-extra Architecture: all Depends: defoma -Conflicts: ttf-unfonts (<< 1.0.1-7) -Replaces: ttf-unfonts (<< 1.0.1-7) -Description: Un series Korean TrueType fonts (extra) +Conflicts: ttf-unfonts (<< 1.0.1-6ubuntu1) +Replaces: ttf-unfonts (<< 1.0.1-6ubuntu1) +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. . - They package has the less common font families. In most cases, - ttf-unfonts-core package is enough for daily use. + This package does not contain the UnBatang and UnDotum fonts. If you want + those, please install the -core package. diff -pruN 1.0.1-7/debian/preinst 1.0.1-7ubuntu1/debian/preinst --- 1.0.1-7/debian/preinst 1970-01-01 01:00:00.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/preinst 2008-05-30 15:07:30.000000000 +0100 @@ -0,0 +1,29 @@ +#!/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 "1.0.1-6ubuntu1"; then + rm_conffile ttf-unfonts "/etc/defoma/hints/ttf-unfonts.hints" + fi +esac + + diff -pruN 1.0.1-7/debian/rules 1.0.1-7ubuntu1/debian/rules --- 1.0.1-7/debian/rules 2008-05-30 15:48:59.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/rules 2008-05-30 15:07:30.000000000 +0100 @@ -42,7 +42,12 @@ install: build dh_installdirs install -d $(CURDIR)/debian/ttf-unfonts-core/usr/share/fonts/truetype/unfonts - for T in un-fonts-core/un-fonts/*.ttf; do \ + for T in un-fonts-core/un-fonts/UnBatang*.ttf; do \ + echo "Installing $$T..."; \ + install -m644 $$T $(CURDIR)/debian/ttf-unfonts-core/$(FONTDIR)/; \ + done + + for T in un-fonts-core/un-fonts/UnDotum*.ttf; do \ echo "Installing $$T..."; \ install -m644 $$T $(CURDIR)/debian/ttf-unfonts-core/$(FONTDIR)/; \ done @@ -53,6 +58,11 @@ install: build install -m644 $$T $(CURDIR)/debian/ttf-unfonts-extra/$(FONTDIR)/; \ done + for T in un-fonts-core/un-fonts/Un[GP]*.ttf; do \ + echo "Installing $$T..."; \ + install -m644 $$T $(CURDIR)/debian/ttf-unfonts-extra/$(FONTDIR)/; \ + done + # fix wrong *Dotum's sub-family (style) name for T in $(CURDIR)/debian/ttf-unfonts-core/$(FONTDIR)/*Bold.ttf; do \ fontforge -script $(CURDIR)/debian/fix-bold-styles.pe $$T || \ @@ -61,9 +71,9 @@ install: build # fix wrong UnGraphicDotum's family name fontforge -script $(CURDIR)/debian/fix-ungraphicbold-name.pe \ - $(CURDIR)/debian/ttf-unfonts-core/$(FONTDIR)/UnGraphicBold.ttf + $(CURDIR)/debian/ttf-unfonts-extra/$(FONTDIR)/UnGraphicBold.ttf mv output.ttf \ - $(CURDIR)/debian/ttf-unfonts-core/$(FONTDIR)/UnGraphicBold.ttf + $(CURDIR)/debian/ttf-unfonts-extra/$(FONTDIR)/UnGraphicBold.ttf # install hint information # install -m644 debian/ttf-unfonts.conf $(CURDIR)/debian/ttf-unfonts/etc/fonts/conf.avail/20-ttf-unfonts.conf diff -pruN 1.0.1-7/debian/ttf-unfonts-core.conf 1.0.1-7ubuntu1/debian/ttf-unfonts-core.conf --- 1.0.1-7/debian/ttf-unfonts-core.conf 2008-05-30 15:48:59.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/ttf-unfonts-core.conf 2008-05-30 15:07:30.000000000 +0100 @@ -5,9 +5,6 @@ 은 바탕UnBatang 은 돋움UnDotum - 은 궁서UnGungseo - 은 필기UnPilgi - 은 그래픽UnGraphic true diff -pruN 1.0.1-7/debian/ttf-unfonts-core.defoma-hints 1.0.1-7ubuntu1/debian/ttf-unfonts-core.defoma-hints --- 1.0.1-7/debian/ttf-unfonts-core.defoma-hints 2008-05-30 15:48:59.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/ttf-unfonts-core.defoma-hints 2008-05-30 15:07:30.000000000 +0100 @@ -61,77 +61,3 @@ begin /usr/share/fonts/truetype/unfonts/ X-Spacing = c end -begin /usr/share/fonts/truetype/unfonts/UnGraphic.ttf - Family = Graphic - FontName = Graphic-Regular - Encoding = Unicode - Location = Korean - Charset = ISO10646-1 KSX1001 - GeneralFamily = SansSerif - Weight = Medium - Width = Variable - Shape = Serif Upright - Foundry = Un - Priority = 20 - X-Spacing = c -end - -begin /usr/share/fonts/truetype/unfonts/UnGraphicBold.ttf - Family = Graphic - FontName = Graphic-Bold - Encoding = Unicode - Location = Korean - Charset = ISO10646-1 KSX1001 - GeneralFamily = SansSerif - Weight = Bold - Width = Variable - Shape = Serif Upright - Foundry = Un - Priority = 20 - X-Spacing = c -end - -begin /usr/share/fonts/truetype/unfonts/UnGungseo.ttf - Family = Gungseo - FontName = Gungseo-Regular - Encoding = Unicode - Location = Korean - Charset = ISO10646-1 KSX1001 - GeneralFamily = Serif - Weight = Medium - Width = Variable - Shape = Serif Upright - Foundry = Un - Priority = 20 - X-Spacing = c -end - -begin /usr/share/fonts/truetype/unfonts/UnPilgi.ttf - Family = Pilgi - FontName = Pilgi-Regular - Encoding = Unicode - Location = Korean - Charset = ISO10646-1 KSX1001 - GeneralFamily = Serif - Weight = Medium - Width = Variable - Shape = Serif Upright - Foundry = Un - Priority = 20 - X-Spacing = c -end - -begin /usr/share/fonts/truetype/unfonts/UnPilgiBold.ttf - Family = Pilgi - FontName = Pilgi-Bold - Encoding = Unicode - Location = Korean - Charset = ISO10646-1 KSX1001 - GeneralFamily = Serif - Weight = Bold - Width = Variable - Shape = Serif Upright - Foundry = Un - Priority = 20 - X-Spacing = c -end diff -pruN 1.0.1-7/debian/ttf-unfonts-core.dirs 1.0.1-7ubuntu1/debian/ttf-unfonts-core.dirs --- 1.0.1-7/debian/ttf-unfonts-core.dirs 1970-01-01 01:00:00.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/ttf-unfonts-core.dirs 2008-05-30 15:07:30.000000000 +0100 @@ -0,0 +1,3 @@ +usr/share/fonts/truetype/unfonts +etc/fonts/conf.avail +etc/fonts/conf.d diff -pruN 1.0.1-7/debian/ttf-unfonts-extra.conf 1.0.1-7ubuntu1/debian/ttf-unfonts-extra.conf --- 1.0.1-7/debian/ttf-unfonts-extra.conf 2008-05-30 15:48:59.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/ttf-unfonts-extra.conf 2008-05-30 15:07:30.000000000 +0100 @@ -3,9 +3,12 @@ + 은 궁서UnGungseo + 은 필기UnPilgi 은 타자UnTaza 은 신문UnShinmun 은 옛글UnYetgul + 은 그래픽UnGraphic 은 펜흘림UnPenheulim 은 펜UnPen 은 봄UnBom diff -pruN 1.0.1-7/debian/ttf-unfonts-extra.defoma-hints 1.0.1-7ubuntu1/debian/ttf-unfonts-extra.defoma-hints --- 1.0.1-7/debian/ttf-unfonts-extra.defoma-hints 2008-05-30 15:48:59.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/ttf-unfonts-extra.defoma-hints 2008-05-30 15:07:30.000000000 +0100 @@ -15,6 +15,51 @@ begin /usr/share/fonts/truetype/unfonts/ X-Spacing = c end +begin /usr/share/fonts/truetype/unfonts/UnGraphic.ttf + Family = Graphic + FontName = Graphic-Regular + Encoding = Unicode + Location = Korean + Charset = ISO10646-1 KSX1001 + GeneralFamily = SansSerif + Weight = Medium + Width = Variable + Shape = Serif Upright + Foundry = Un + Priority = 20 + X-Spacing = c +end + +begin /usr/share/fonts/truetype/unfonts/UnGraphicBold.ttf + Family = Graphic + FontName = Graphic-Bold + Encoding = Unicode + Location = Korean + Charset = ISO10646-1 KSX1001 + GeneralFamily = SansSerif + Weight = Bold + Width = Variable + Shape = Serif Upright + Foundry = Un + Priority = 20 + X-Spacing = c +end + +begin /usr/share/fonts/truetype/unfonts/UnGungseo.ttf + Family = Gungseo + FontName = Gungseo-Regular + Encoding = Unicode + Location = Korean + Charset = ISO10646-1 KSX1001 + GeneralFamily = Serif + Weight = Medium + Width = Variable + Shape = Serif Upright + Foundry = Un + Priority = 20 + X-Spacing = c +end + begin /usr/share/fonts/truetype/unfonts/UnJamoBatang.ttf Family = JamoBatang FontName = JamoBatang-Regular @@ -105,6 +150,36 @@ begin /usr/share/fonts/truetype/unfonts/ X-Spacing = c end +begin /usr/share/fonts/truetype/unfonts/UnPilgi.ttf + Family = Pilgi + FontName = Pilgi-Regular + Encoding = Unicode + Location = Korean + Charset = ISO10646-1 KSX1001 + GeneralFamily = Serif + Weight = Medium + Width = Variable + Shape = Serif Upright + Foundry = Un + Priority = 20 + X-Spacing = c +end + +begin /usr/share/fonts/truetype/unfonts/UnPilgiBold.ttf + Family = Pilgi + FontName = Pilgi-Bold + Encoding = Unicode + Location = Korean + Charset = ISO10646-1 KSX1001 + GeneralFamily = Serif + Weight = Bold + Width = Variable + Shape = Serif Upright + Foundry = Un + Priority = 20 + X-Spacing = c +end + begin /usr/share/fonts/truetype/unfonts/UnShinmun.ttf Family = Shinmun FontName = Shinmun-Regular diff -pruN 1.0.1-7/debian/ttf-unfonts-extra.dirs 1.0.1-7ubuntu1/debian/ttf-unfonts-extra.dirs --- 1.0.1-7/debian/ttf-unfonts-extra.dirs 1970-01-01 01:00:00.000000000 +0100 +++ 1.0.1-7ubuntu1/debian/ttf-unfonts-extra.dirs 2008-05-30 15:07:30.000000000 +0100 @@ -0,0 +1,3 @@ +usr/share/fonts/truetype/unfonts +etc/fonts/conf.avail +etc/fonts/conf.d