r76577 - in /trunk/libimager-perl: FT2/t/t10ft2.t README T1/t/t10type1.t T1/t/t20oo.t image.c lib/Imager/APIRef.pod samples/samp-form.cgi

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Sat Jun 25 22:11:58 2011
New Revision: 76577

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=76577
Log:
un applying patch

Modified:
    trunk/libimager-perl/FT2/t/t10ft2.t
    trunk/libimager-perl/README
    trunk/libimager-perl/T1/t/t10type1.t
    trunk/libimager-perl/T1/t/t20oo.t
    trunk/libimager-perl/image.c
    trunk/libimager-perl/lib/Imager/APIRef.pod
    trunk/libimager-perl/samples/samp-form.cgi

Modified: trunk/libimager-perl/FT2/t/t10ft2.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/FT2/t/t10ft2.t?rev=76577&op=diff
==============================================================================
--- trunk/libimager-perl/FT2/t/t10ft2.t (original)
+++ trunk/libimager-perl/FT2/t/t10ft2.t Sat Jun 25 22:11:58 2011
@@ -341,8 +341,6 @@
          "and returns correct error when we ask");
 
   # try a MM font now - test font only has A defined
-  SKIP: {
-    skip "MMOne.pfb file removed for copyright reasons", 11;
   print "# Try a multiple master font\n";
   my $mmfont = Imager::Font->new(file=>"fontfiles/MMOne.pfb", type=>"ft2", 
                                  color=>"white", aa=>1, size=>60);
@@ -374,7 +372,6 @@
   }
 
   ok($mmim->write(file=>"testout/t38mm.ppm"), "save MM output");
- }
 
  SKIP:
   { print "# alignment tests\n";

Modified: trunk/libimager-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/README?rev=76577&op=diff
==============================================================================
--- trunk/libimager-perl/README (original)
+++ trunk/libimager-perl/README Sat Jun 25 22:11:58 2011
@@ -5,8 +5,7 @@
 modify it under the same terms as Perl itself.
 
 A test font, FT2/fontfiles/MMOne.pfb contains Postscript code
-copyrighted by Adobe.  However for the Debian system
-this has been reomoved for copyright reasons.
+copyrighted by Adobe.  See adobe.txt for license information.
 ================================================================
 
 >> THIS SOFTWARE COMES WITH ABSOLUTELY NO WARRANTY WHATSOEVER <<

Modified: trunk/libimager-perl/T1/t/t10type1.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/T1/t/t10type1.t?rev=76577&op=diff
==============================================================================
--- trunk/libimager-perl/T1/t/t10type1.t (original)
+++ trunk/libimager-perl/T1/t/t10type1.t Sat Jun 25 22:11:58 2011
@@ -1,6 +1,6 @@
 #!perl -w
 use strict;
-use Test::More qw(skip_all);
+use Test::More;
 use Imager ':all';
 use Imager::Test qw(diff_text_with_nul is_color3);
 use Imager::Font::T1;

Modified: trunk/libimager-perl/T1/t/t20oo.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/T1/t/t20oo.t?rev=76577&op=diff
==============================================================================
--- trunk/libimager-perl/T1/t/t20oo.t (original)
+++ trunk/libimager-perl/T1/t/t20oo.t Sat Jun 25 22:11:58 2011
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 use strict;
 use Imager;
-use Test::More skip_all => 'removed non-DFSG material';
+use Test::More tests => 9;
 
 # extracted from t/t36oofont.t
 

Modified: trunk/libimager-perl/image.c
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/image.c?rev=76577&op=diff
==============================================================================
--- trunk/libimager-perl/image.c (original)
+++ trunk/libimager-perl/image.c Sat Jun 25 22:11:58 2011
@@ -316,7 +316,7 @@
 /*
 =item i_img_setmask(C<im>, C<ch_mask>)
 =category Image Information
-=synopsis // only channel 0 writable
+=synopsis // only channel 0 writeable 
 =synopsis i_img_setmask(img, 0x01);
 
 Set the image channel mask for C<im> to C<ch_mask>.

Modified: trunk/libimager-perl/lib/Imager/APIRef.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/lib/Imager/APIRef.pod?rev=76577&op=diff
==============================================================================
--- trunk/libimager-perl/lib/Imager/APIRef.pod (original)
+++ trunk/libimager-perl/lib/Imager/APIRef.pod Sat Jun 25 22:11:58 2011
@@ -72,7 +72,7 @@
   # Image Implementation
 
   # Image Information
-  // only channel 0 writable
+  // only channel 0 writeable 
   i_img_setmask(img, 0x01);
   int mask = i_img_getmask(img);
   int channels = i_img_getchannels(img);

Modified: trunk/libimager-perl/samples/samp-form.cgi
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/samples/samp-form.cgi?rev=76577&op=diff
==============================================================================
--- trunk/libimager-perl/samples/samp-form.cgi (original)
+++ trunk/libimager-perl/samples/samp-form.cgi Sat Jun 25 22:11:58 2011
@@ -138,7 +138,7 @@
 expensive CGI request to generate the image, but it means you need
 some mechanism to manage the files (for example, a cron job to delete
 old files), and you need to make some directory under the document
-root writable by the user that your web server runs CGI programs as,
+root writeable by the user that your web server runs CGI programs as,
 which may be a security concern.
 
 Also, if you're generating large numbers of large images, you may end