r2438 - in packages/libfont-ttf-perl/trunk: . debian lib/Font/TTF
gregor herrmann
gregoa-guest at costa.debian.org
Sat Mar 18 18:38:04 UTC 2006
Author: gregoa-guest
Date: 2006-03-18 18:38:03 +0000 (Sat, 18 Mar 2006)
New Revision: 2438
Added:
packages/libfont-ttf-perl/trunk/COPYING
Removed:
packages/libfont-ttf-perl/trunk/Makefile.PL
Modified:
packages/libfont-ttf-perl/trunk/MANIFEST
packages/libfont-ttf-perl/trunk/MANIFEST.SKIP
packages/libfont-ttf-perl/trunk/META.yml
packages/libfont-ttf-perl/trunk/debian/changelog
packages/libfont-ttf-perl/trunk/debian/compat
packages/libfont-ttf-perl/trunk/debian/control
packages/libfont-ttf-perl/trunk/lib/Font/TTF/Cmap.pm
packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm
packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm
Log:
new upstream
debhelper 5
manually resolves Delta.pm
Copied: packages/libfont-ttf-perl/trunk/COPYING (from rev 2437, packages/libfont-ttf-perl/branches/upstream/current/COPYING)
Modified: packages/libfont-ttf-perl/trunk/MANIFEST
===================================================================
--- packages/libfont-ttf-perl/trunk/MANIFEST 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/MANIFEST 2006-03-18 18:38:03 UTC (rev 2438)
@@ -1,3 +1,4 @@
+COPYING
lib/Font/TTF/AATKern.pm
lib/Font/TTF/AATutils.pm
lib/Font/TTF/Anchor.pm
@@ -59,9 +60,8 @@
lib/Font/TTF/Win32.pm
lib/Font/TTF/XMLparse.pm
lib/ttfmod.pl
-Makefile
Makefile.PL
MANIFEST This list of files
MANIFEST.SKIP
+META.yml
README.TXT
-META.yml Module meta-data (added by MakeMaker)
Modified: packages/libfont-ttf-perl/trunk/MANIFEST.SKIP
===================================================================
--- packages/libfont-ttf-perl/trunk/MANIFEST.SKIP 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/MANIFEST.SKIP 2006-03-18 18:38:03 UTC (rev 2438)
@@ -10,3 +10,5 @@
\.cvsignore
^#
\.svn/
+^Makefile$
+~$
Modified: packages/libfont-ttf-perl/trunk/META.yml
===================================================================
--- packages/libfont-ttf-perl/trunk/META.yml 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/META.yml 2006-03-18 18:38:03 UTC (rev 2438)
@@ -1,8 +1,8 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Font-TTF
-version: 0.37
-version_from: lib/Font/TTF/Font.pm
+version: 0.38
+version_from:
installdirs: site
requires:
Deleted: packages/libfont-ttf-perl/trunk/Makefile.PL
===================================================================
--- packages/libfont-ttf-perl/trunk/Makefile.PL 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/Makefile.PL 2006-03-18 18:38:03 UTC (rev 2438)
@@ -1,39 +0,0 @@
-use ExtUtils::MakeMaker;
-
- at theselibs = grep {-f } glob("lib/Font/TTF/*");
-
-# incantation to enable MY::pm_to_blib later on
-push(@ExtUtils::MakeMaker::Overridable, qw(pm_to_blib)) if ($^O eq 'MSWin32');
-
-WriteMakefile (
- NAME => "Font::TTF",
- VERSION_FROM => "lib/Font/TTF/Font.pm",
-# HTMLLIBPODS => {map {my $t = $_; $t=~s/\..*?$/.html/o; $t='blib/Html/'.$t; $_ => $t;} @theselibs},
-# HTMLSCRIPTPODS => {map {my $t=$_; $t=~s/\..*?$/.html/o; $t='blib/Html/'.$t; $_ => $t;} @scripts},
- AUTHOR => "martin_hosken\@sil.org",
- ABSTRACT => "TTF font support for Perl",
- dist => { 'TO_UNIX' => 'perl -Mtounix -e "tounix(\"$(DISTVNAME)\")"' }
- );
-
-if ($^O eq 'MSWin32') {
-# incantation to solve the problem of everyone's $Config{make} being 'nmake'
-# when we want 'pmake'. And $Config{} is read only.
-# actually, this is just a copy of the code from ExtUtiles::MM_Win32 tidied
-# up (to expose tabs) and the dependency on Config removed
-sub MY::pm_to_blib
-{
- my $self = shift;
- my($autodir) = $self->catdir('$(INST_LIB)','auto');
- return <<"EOT";
-
-pm_to_blib: \$(TO_INST_PM)
-\t$self->{NOECHO}\$(PERL) \"-I\$(INST_ARCHLINE)\" \"-I\$(INST_LIB)\" \\
-\t\"-I\$(PERL_ARCHLIB)\" \"-I\$(PERL_LIB)\" -MExtUtils::Install \\
-\t-e \"pm_to_blib({ qw[\$(PM_TO_BLIB)] }, '$autodir')
-\t$self->{NOECHO}\$(TOUCH) \$@
-
-EOT
-}
-
-}
-
Modified: packages/libfont-ttf-perl/trunk/debian/changelog
===================================================================
--- packages/libfont-ttf-perl/trunk/debian/changelog 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/debian/changelog 2006-03-18 18:38:03 UTC (rev 2438)
@@ -1,3 +1,10 @@
+libfont-ttf-perl (0.38.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Update to debhelper compatibility level 5.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 18 Mar 2006 19:19:54 +0100
+
libfont-ttf-perl (0.37-1) unstable; urgency=low
* New upstream release.
Modified: packages/libfont-ttf-perl/trunk/debian/compat
===================================================================
--- packages/libfont-ttf-perl/trunk/debian/compat 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/debian/compat 2006-03-18 18:38:03 UTC (rev 2438)
@@ -1 +1 @@
-4
+5
Modified: packages/libfont-ttf-perl/trunk/debian/control
===================================================================
--- packages/libfont-ttf-perl/trunk/debian/control 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/debian/control 2006-03-18 18:38:03 UTC (rev 2438)
@@ -2,8 +2,8 @@
Section: perl
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Gunnar Wolf <gwolf at debian.org>, Russ Allbery <rra at debian.org>
-Build-Depends: debhelper (>= 4.0.2), perl (>= 5.8.0-19)
+Uploaders: Gunnar Wolf <gwolf at debian.org>, Russ Allbery <rra at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
+Build-Depends: debhelper (>= 5.0.0), perl (>= 5.8.0-19)
Standards-Version: 3.6.2
Package: libfont-ttf-perl
Modified: packages/libfont-ttf-perl/trunk/lib/Font/TTF/Cmap.pm
===================================================================
--- packages/libfont-ttf-perl/trunk/lib/Font/TTF/Cmap.pm 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/lib/Font/TTF/Cmap.pm 2006-03-18 18:38:03 UTC (rev 2438)
@@ -278,7 +278,10 @@
for ($i = 0; $i < $self->{'Num'}; $i++)
{
$s = $self->{'Tables'}[$i];
- @keys = sort {$a <=> $b} keys %{$s->{'val'}};
+ if ($s->{'Format'} < 8)
+ { @keys = sort {$a <=> $b} grep { $_ <= 0xFFFF} keys %{$s->{'val'}}; }
+ else
+ { @keys = sort {$a <=> $b} keys %{$s->{'val'}}; }
$s->{' outloc'} = $fh->tell();
if ($s->{'Format'} < 8)
{ $fh->print(pack("n3", $s->{'Format'}, 0, $s->{'Ver'})); } # come back for length
Modified: packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm
===================================================================
--- packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm 2006-03-18 18:38:03 UTC (rev 2438)
@@ -266,8 +266,12 @@
$table = $self->{' PARENT'}{'hhea'}->read;
# try any way we can to get some real numbers passed around!
- if ($table->{'Ascender'} != 0 || $table->{'Descender'} != 0)
+ if (($self->{'fsSelection'} & 128) != 0)
{
+ # assume the user knows what they are doing and has sensible values already
+ }
+ elsif ($table->{'Ascender'} != 0 || $table->{'Descender'} != 0)
+ {
$self->{'sTypoAscender'} = $table->{'Ascender'};
$self->{'sTypoDescender'} = $table->{'Descender'};
$self->{'sTypoLineGap'} = $table->{'LineGap'};
Modified: packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm
===================================================================
--- packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm 2006-03-18 17:59:37 UTC (rev 2437)
+++ packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm 2006-03-18 18:38:03 UTC (rev 2438)
@@ -1039,16 +1039,16 @@
} elsif ($type == 6 && $fmt == 3)
{
$r = $lookup->{'RULES'}[0][0];
- $out .= pack('n2', $fmt, $#{$r->{'PRE'}} + 1);
+ $out .= pack('n2', $fmt, scalar @{$r->{'PRE'}});
foreach $t (@{$r->{'PRE'}})
{ $out .= Font::TTF::Ttopen::ref_cache($t, $ctables, length($out)); }
- $out .= pack('n', $#{$r->{'MATCH'}} + 1);
+ $out .= pack('n', scalar @{$r->{'MATCH'}});
foreach $t (@{$r->{'MATCH'}})
{ $out .= Font::TTF::Ttopen::ref_cache($t, $ctables, length($out)); }
- $out .= pack('n', $#{$r->{'POST'}} + 1);
+ $out .= pack('n', scalar @{$r->{'POST'}});
foreach $t (@{$r->{'POST'}})
{ $out .= Font::TTF::Ttopen::ref_cache($t, $ctables, length($out)); }
- $out .= pack('n', $#{$r->{'ACTION'}} + 1);
+ $out .= pack('n', scalar @{$r->{'ACTION'}});
foreach $t (@{$r->{'ACTION'}})
{ $out .= pack('n2', @$t); }
}
More information about the Pkg-perl-cvs-commits
mailing list