From 7c775dcc93c2f1179ffc34c434ec341541462134 Mon Sep 17 00:00:00 2001 From: nim Date: Mar 20 2007 20:30:42 +0000 Subject: auto-import dejavu-fonts-2.16-0.1.20070319svn1699.fc7 on branch devel from dejavu-fonts-2.16-0.1.20070319svn1699.fc7.src.rpm 2.16 pre snapshot for F7T3 --- diff --git a/.cvsignore b/.cvsignore index 44c42ea..9f07285 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dejavu-sfd-2.14.tar.bz2 +dejavu-sfd-20070319-1699.tar.bz2 diff --git a/01_oblique-hinting.patch b/01_oblique-hinting.patch deleted file mode 100644 index 5f9bb5a..0000000 --- a/01_oblique-hinting.patch +++ /dev/null @@ -1,272 +0,0 @@ -Index: DejaVuSansOblique.sfd -=================================================================== ---- DejaVuSansOblique.sfd (revision 1507) -+++ DejaVuSansOblique.sfd (revision 1532) -@@ -2053,12 +2053,12 @@ - Encoding: 97 97 97 - Width: 1255 - Flags: W --TtfInstrs: 281 -+TtfInstrs: 284 - 5\(N@&J,HV'Fk9I!"02:$4R.>!$`Zh,U!H$!<<9+!X8`1!<<0)!!&f0`WlF --jRiBBlk&RrmLhMm3>"830M>>H#7q(+#6jK,(HD^3"mlm<3lXj) -+D[\$f"rKuLHPB-mH3R4T!@o?;(CglU#:0BN*Wlff"!nO(*[M:&+tO;tZC_F(?0p(H599i2lk($o -+&NMi`(HF2M0>urDr:K=emL\e!3>+=a3B8cd;cj89"mlNum1C-p#7q(+&JmG4"mlm<3sL#)(d&[3(g@h])/:"')1!-G)2f>g)%/286P_p'<#/:HA/8PhF;Ag3K,/tR -+$XEd=5SKt$TF7D$TFIP;TH^$RV'M]a#ln6r%IbsB/W_Q'/Pn#`/Hu5] - EndTtf - AnchorPoint: "below" 500 0 basechar 0 - AnchorPoint: "above" 718 1147 basechar 0 -@@ -2105,10 +2105,10 @@ - Encoding: 98 98 98 - Width: 1300 - Flags: W --TtfInstrs: 178 -+TtfInstrs: 169 - 5YVUn!XoA=,U3Eq"pY85#R)Iu+pB5:+!:V++U')9,8:dm'bUZq,:*L=,U5>n&e"k9'b!bW;&+C& -->Tt@:,le5p,8)7%%N$H;,:"TIo]4Ng&NLIa3>+=b3ACLem,[g*&FL,j3A=*)=9fB@m0ldU&&l_uH!%.`]!!*'H!%%\23"\)/=gFYI!F5[* -+>Tt@:,le5p,8)7%%N$H;,:"TIoWk)6!F=d9Zk+(i(]n"0&NLIa3>+=b3ACLem,[g*&FL,j3A=*) -+=9fB@m0lh=*-\*QG>lXj) - EndTtf - AnchorPoint: "above" 465.049 1520 basechar 0 - AnchorPoint: "below" 586.591 0 basechar 0 -@@ -2184,10 +2184,10 @@ - Encoding: 100 100 100 - Width: 1300 - Flags: W --TtfInstrs: 171 -+TtfInstrs: 166 - 5YN7@![&Ke&ePru)B/eq*!Hre!W`?)!!NuI'*T!]&J,*Y&If3O$kELR&eR/8!#HbO$l;S>;%.a^ -->S8%j'G(ie!#-%l&JP]Z+smlnm*t).3B7[3&NMj+!&*^"o^!.W&NMj*92ept&-_G5(HD^(m0=1+ --m0S8%j'G(ie!#-%l&JP]Z+smlnZC_=%?0p'+#@A&R&O-j0?/uSX3>"7`3B8eo0C7cllk&Rs3B8cd -+;cj89"mlm<3J$5H2J:(^/:$@E%O+aOu&-OM+,#lk&;'GU]p,Ru%<+t!rom*tA^3>!&f&NMQG&ENKMj:M=_ --mL\e?Z>_2m!F5_!YS'o;]`9G[^]4B8-NGLo5WB?73*AKtDZF\VDZXhZC^=qcD[LCjD^96ID^L>T --MA2HlR1p0m'9>l\.1 -+TtfInstrs: 157 -+5U6>J$5H2J:(^/:$@E%O+aOu&-OM+,#lk&;'GU]p,Ru%<+t!roZC`':?0p'+$h,Fg,bH>h,X3OX -+?0jR3&JmG>3ACLFjRhg"&H;=i&FM6XE$t_f>ld2ADZF\VDZXhZC^=qcD[LCjD^96ID^L>TMA2Hl -+R1p0m'9>l\.2Z8Msh>sJ_c.*sB8-pK*_>lXj) - EndTtf - AnchorPoint: "below" 536 0 basechar 0 - AnchorPoint: "above" 729 1147 basechar 0 -@@ -2270,10 +2270,11 @@ - Encoding: 102 102 102 - Width: 721 - Flags: W --TtfInstrs: 155 -+TtfInstrs: 184 - 5WfAW$P*UO"V1tF"V1tB!sA],"U,DI$T\G&!=T6P"p',P>Rgse$4I7O%0R%P&.&UI"pG&/#nI"H --$PX0%9<\_%9<\b&>>)1.<*N#"$rgG(YRXW:9<\q+>>)13<*N#"&QDt:\H!$;^c5K8bRkXO&f3P_ --!&*Cgr9P!_1(lT-0M>>H#7q(+&JmG4"mlNum0=1+m9(V5 -+$PX0%9<\_%9<\b&>>)1.<*N#"$rgG(YROQ99<\n*>>)12<*N#"&6)k,YRsi==LeD>s1gTs`3aIo -+?k3%O;r(o]4Ng&NLXf&NLF93ACLe4RD_,&NMj33A=*)=9fB@m0lXj) -+%KI:V$jHe8"VD7G-Pm:>%O;r(oWk)!!F=d9ZsOV6(BRn/&NLXf&NLF93ACLe4RD_,&NMj33A=*) -+=9fB@m08C>lXj) - EndTtf - AnchorPoint: "below" 526.772 0 basechar 0 - AnchorPoint: "above" 454 1520 basechar 0 -@@ -2390,9 +2390,9 @@ - Encoding: 105 105 105 - Width: 569 - Flags: W --TtfInstrs: 113 --5Ulg=!rrE("TSN)"pG57#6b86":$sh@fTa:IKfu]"9ei-""4-q":$1X&G3p5jM3c9&J@)Y!&*F2 --lnD(2=9fB@m0=1+m0=1+m0=1+m9(X=5R@Gl>ldU&&l_uH!!rV?!!*'*!!iQi3"\)/=TAF% -+TtfInstrs: 112 -+5Ulg=!rrE("TSN)"pG57#6b86":$sh@fTa:IKfu]"9ei-""4-q":$1X&G39##6A,K5Qu*0?j$O: -+o]3eJ3=ula0`Wlfr9Q+1;cj89"mlO+"mlO+"mlO+"moG:Z9S]s!F7qqE!]nY:^I50 - EndTtf - AnchorPoint: "below" 155.772 0 basechar 0 - AnchorPoint: "above" 461.64 1567 basechar 0 -@@ -2414,11 +2414,11 @@ - Encoding: 106 106 106 - Width: 569 - Flags: W --TtfInstrs: 181 -+TtfInstrs: 204 - 5X>tc&e>Td"V2+V#R:P;"9Si7!X0&6%KQ_5!"M$l#QbJ;$31ZJ%gm^jIfOp.>S@\M&.]*]#nRUQ --$OIFo%fd7SeCt!!*'5!#,CJ3"\)/=[3iX%keJI&MFbn%olXj) -+$OIFo%fd7Se3FI^!+5e'!'gN>H#7q(+#7q(+=X(.:"T\X0Z=!h: -->ldU&&l_uH!!N>;!!*'&!!E9e3"\)/=TAF% -+TtfInstrs: 74 -+5SjJ*!rrE("TSN)3WNCd!WrH'!$q^m";(42T*#+"j:K*>3ACLelnD(2=9fB@m0=1+m9(X=5Qq/h -+?*[iA!F5`5E!9&A!aPd+ - EndTtf - AnchorPoint: "above" 452.23 1520 basechar 0 - AnchorPoint: "below" 156.772 0 basechar 0 -@@ -2495,12 +2495,12 @@ - Encoding: 109 109 109 - Width: 1995 - Flags: W --TtfInstrs: 244 -+TtfInstrs: 277 - 5][VQ&ePZY'b:HV%1E^M%1N^O#6k>7"UP87!!*'$"T\W()$Lot)AX+j'c7)n)BU"%+<:V))B8o" --)]CaS%h&OC*?tOd!>Po7-6RURIMiRq)&aJ3&e>HU)[ulN,6e,s!=U1n)\"/>!@J'T.2s0N/.hHl --eElPOlk)5i3=ula&J@)a&J>m?&NMQG00DAXoK;Iq&JmGD3A=*)=9fB@m0Po7-6RURIMiRq)&aJ3&e>HU)[ulN,6e,s!=U1n)\"/>!@J'T.2s0N/.hHZ -+T,I`9`3aJ&?lK/Qe3FKC.A/,_.?Gus.8MAs?0pq-['(]^,6D0;&NLF`&J@)9&ihra&f3P?3ACLe -+4?V]s4R=g8(HE9l0M>>H#7q(+#6jK,(HD^(m1C-p#7q(+#7q(+#7q(+&JmG4&-_G+&-_G5(HGVB -+Z7mj2!F<-!/RU/L/H]9D'E9ZA/\`m1/YF\W/T34;/Pdr)>lXj) - EndTtf - AnchorPoint: "above" 1112.48 1147 basechar 0 - AnchorPoint: "below" 889.523 0 basechar 0 -@@ -2545,11 +2545,10 @@ - Encoding: 110 110 110 - Width: 1298 - Flags: W --TtfInstrs: 181 -+TtfInstrs: 174 - 5YVLh"pG,5!sJZ*!!3<)!<lXj) -+%KI:V$jHe8"VD7G-Pm:C%O;r(oWk)!!F=d9ZsOV6(BRn/&NLXf&NLF93ACLe4QQ/$&NMj33A=*) -+=9fB@m0=lnJJOjRhdMmP"Z7YS'o;]`95U^]4B8+TNYc5WB?73*EP+ --+otsL -+TtfInstrs: 69 -+5S=f*!#nT4%"A[m$pP.'?0j9G&ENKM&FM4QZ>^ug>sJ_c -+,+p-0,!R7S>lXj) - EndTtf - AnchorPoint: "below" 528.342 0 basechar 0 - AnchorPoint: "above" 733 1147 basechar 0 -@@ -2618,11 +2617,11 @@ - Encoding: 112 112 112 - Width: 1300 - Flags: W --TtfInstrs: 189 -+TtfInstrs: 233 - 5Yhap!XoA=,U3Eq"pY85#R)J!,9d::,9J$0*[(\3,U4!:!Yl=O,U4T=,U=Tq+VFkc9HF:0'm^ou --,(Cke-6ac_#ll+n&gRGe(aLCP-4n["YR4?&YROQ99<\n*>>)12<*N#"&6)k9\H!lS^c5KXeEdc- --&igRb3>+>,!"e5PjRhdMmL_H>0M>>H#7q(+#6jK,(HD^3"mlm<3lXj) -+,(Cke-6ac_#ll+n&gRGe(aLCP-4n["YR+9%YR4?69<\e'>>)1/<*N#"%9-P)YRXW:9<\q+>>)13 -+<*N#"&QDt:\H!lS^c5KXe3F=i(ge+E(_7Gd?0i.`&igRb3>+>,!"e5PjRhdMmL_H>0M>>H#7q(+ -+#6jK,(HD^3"mlm<3sJ^h-]f^+-\!KH>lXj) - EndTtf - AnchorPoint: "above" 830.88 1147 basechar 0 - AnchorPoint: "below" 524.343 -430 basechar 0 -@@ -2662,10 +2661,10 @@ - Encoding: 113 113 113 - Width: 1300 - Flags: W --TtfInstrs: 166 -+TtfInstrs: 173 - 5YN-u*?,.p&JuAe(E*Gh&eP0G!WrE+&ePc\&eYcf"VMCV%K[%L"VD@Z3Y)32(JFoO9FQ4L;%e?i --INoL?&.nmV%iQ',&JP]Z+sRZk9<]%.=LeD9!'iMHm*t)V3>"7`3>"8+!"e5PjRhdMmL_H>0M>>H --#7q(+&JmG4"mlO+"mlNum1C-p#7q(+&JmG4"mlm<3E[Q3?mGaR?*\u+!F5[* -+INoL?&.nmV%iQ',&JP]Z+sRZk9<]%.=LeD9!'iMHm*rlXj) - EndTtf - AnchorPoint: "above" 775.491 1147 basechar 0 - AnchorPoint: "below" 493.953 -430 basechar 0 -@@ -2703,10 +2702,10 @@ - Encoding: 114 114 114 - Width: 842 - Flags: W --TtfInstrs: 133 --5Re).!!WQ<#71tK#UC#ooYerd3>!&f0`XHI"q(Y9&Hb]:H3o$*0BDcleBALb3A=+13`&pD)@$EO --#m^Y;!WrW1#m^tK!Y,SA#m^kA#mgkB&-_G+"mlm<3K>lXj) -+TtfInstrs: 152 -+5Re).!!WQ<#71tK#UC#ooYe+U$"+&@?-KZp&Ps&@>nT.0(HF2M5R[i)#65><9Fc@TIKqOeo^()O -+&NMj*9<^HR=?mc0"UGD?"9ei/"pG;=%1E:J$O$hB$3^_B#R:nEm0sK&g!'gQM!^I5\%mU[k&O7"+'+%sMT+_62 - EndTtf - AnchorPoint: "below" 423.522 0 basechar 0 - AnchorPoint: "above" 588 1147 basechar 0 -@@ -2814,11 +2813,11 @@ - Encoding: 117 117 117 - Width: 1298 - Flags: W --TtfInstrs: 184 -+TtfInstrs: 213 - 5YMh(!Yc4M%h9-S%hB-Z"V)%Q$4?nD"V2+R#R:P;"9f)6"TSQ'!X/T*!'1Mj&HDh<9GC>5!IbOg --%h8RU&.AaF!X0/:%h8Uf(E*k79<\_%9<\b&>>)10<*N#"%THY*YRa];9<\t,>?JE9(]V91=mXYV --&NLXf&igO:3ACLej>-Ao&NMj33A=*)=9fB@m0=1+m1C-p#7q(+(HD^3"mlO+"mlNum1C-p=X!mP --?lK,P -+%h8RU&.AaF!X0/:%h8Uf(E*k79<\_%9<\b&>>)1.<*N#"$rgG(YROQ99<\n*>>)12<*N#"&6)k9 -+\H!HG^c5K&Y874Fm*rCL%R1F)?,X+"%rVs[>nK(53>+=a&ihZH0B=n\lk)6<3B8cd;cj89"mlO+ -+"mlm<3lXj) - EndTtf - AnchorPoint: "below" 571.966 0 basechar 0 - AnchorPoint: "above" 724 1147 basechar 0 -@@ -90350,7 +90349,7 @@ - 600 1556 600 1556 805 1556 c 2,26,-1 - 979 1556 l 1,4,-1 - EndSplineSet --Ligature: 0 0 'liga' f i -+Ligature: 0 2 'liga' f i - LCarets: 0 65535 ' ' 1 0 - EndChar - StartChar: fl -@@ -90385,7 +90384,7 @@ - 409 1397 409 1397 504 1476.5 c 128,-1,21 - 599 1556 599 1556 805 1556 c 2,0,-1 - EndSplineSet --Ligature: 0 0 'liga' f l -+Ligature: 0 2 'liga' f l - LCarets: 0 65535 ' ' 1 0 - EndChar - StartChar: uniFB03 -@@ -90618,8 +90617,8 @@ - 920 1179 920 1179 920 1164 c 0,108,109 - 920 1121 920 1121 946 1087 c 1,1,-1 - EndSplineSet --LCarets: 0 65535 ' ' 1 0 - Ligature: 0 2 'dlig' s t -+LCarets: 0 65535 ' ' 1 0 - EndChar - StartChar: uniFB13 - Encoding: 64275 64275 64275 diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index 573732d..b0d4e41 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -1,9 +1,9 @@ %define archivename dejavu-sfd -#define alphatag .rc1 +%define alphatag .20070319svn1699 # This macro has the same value as %{version}, except when testing pre-release snapshots -#define archiveversion 20070117-1503 -%define archiveversion %{version} +%define archiveversion 20070319-1699 +#define archiveversion %{version} %define fontdir %{_datadir}/fonts/%{name} %define fontconfdir %{_sysconfdir}/fonts @@ -13,21 +13,17 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.14 -Release: 2%{?alphatag}%{?dist} +Version: 2.16 +Release: 0.1%{?alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ -Source0: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.bz2 +Source0: http://dejavu.sourceforge.net/snapshots/%{archivename}-%{archiveversion}.tar.bz2 # DejaVu fontconfig setup Source1: %{name}-fontconfig.conf # DejaVu fontconfig setup (experimental families) Source2: %{name}-experimental-fontconfig.conf -# Sans Oblique fixes cooked between upstream and Debian for Debian freeze -# Extracted from: -# http://ftp.debian.org/debian/pool/main/t/ttf-dejavu/ttf-dejavu_2.14-1.diff.gz -Patch0: 01_oblique-hinting.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fontforge >= 20061019-1 # The CPAN sources do not declare perl(Font::TTF) @@ -79,7 +75,6 @@ This package includes the typefaces the DejaVu project considers experimental. %prep %setup -q -n %{archivename}-%{archiveversion} -%patch0 -p0 %build ./generate.sh @@ -168,6 +163,10 @@ fi %changelog +* Tue Mar 20 2007 Nicolas Mailhot +- 2.16-0.1.20070319svn1699 +- early snapshot to account for F7T3 freeze + * Tue Jan 30 2007 Nicolas Mailhot - 2.14-2 - Adds Dejavu Sans Oblique small fixes (by Ben Laenen to address Debian diff --git a/sources b/sources index 289554e..eaabdcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff5ebadb02f6fd2c81507b56d00aa02b dejavu-sfd-2.14.tar.bz2 +7ff0388662ca732cb11203fdd55d5c99 dejavu-sfd-20070319-1699.tar.bz2