[SCM] Debian packaging of libimager-perl branch, master, updated. debian/0.85+dfsg-1-5-g3457fdb

[gregor herrmann]

The following commit has been merged in the master branch:
commit 7ffa75de7e1a5dadffdb3c1e625eac00e5197972
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Nov 5 18:48:23 2011 +0100

    Remove spelling.patch (applied upstream), update nonfree_tests.patch.

diff --git a/debian/patches/nonfree_tests.patch b/debian/patches/nonfree_tests.patch
index 2b1e726..db34a79 100644
--- a/debian/patches/nonfree_tests.patch
+++ b/debian/patches/nonfree_tests.patch
@@ -1,7 +1,7 @@
 Author: Nicholas Bamber <nicholas at periapt.co.uk>
 Subject: Skipping tests dependent on removed files
 Forwarded: not-needed
-Last-Update: 2011-06-25
+Last-Update: 2011-11-05
 --- a/FT2/t/t10ft2.t
 +++ b/FT2/t/t10ft2.t
 @@ -341,6 +341,8 @@
@@ -45,11 +45,11 @@ Last-Update: 2011-06-25
  use Imager::Font::T1;
 --- a/T1/t/t20oo.t
 +++ b/T1/t/t20oo.t
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
+@@ -2,7 +2,7 @@
  use strict;
  use Imager;
--use Test::More tests => 9;
+ use Imager::Test qw(isnt_image);
+-use Test::More tests => 14;
 +use Test::More skip_all => 'removed non-DFSG material';
  
  # extracted from t/t36oofont.t
diff --git a/debian/patches/series b/debian/patches/series
index 68eea7c..0ed19bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 nonfree_tests.patch
-spelling.patch
 no_t1lib.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 54a6803..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Subject: Spelling
-Forwarded: no
-Last-Update: 2011-06-25
---- a/image.c
-+++ b/image.c
-@@ -318,7 +318,7 @@
- /*
- =item i_img_setmask(C<im>, C<ch_mask>)
- =category Image Information
--=synopsis // only channel 0 writeable 
-+=synopsis // only channel 0 writable
- =synopsis i_img_setmask(img, 0x01);
- 
- Set the image channel mask for C<im> to C<ch_mask>.
---- a/samples/samp-form.cgi
-+++ b/samples/samp-form.cgi
-@@ -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 writeable by the user that your web server runs CGI programs as,
-+root writable 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
---- a/lib/Imager/APIRef.pod
-+++ b/lib/Imager/APIRef.pod
-@@ -74,7 +74,7 @@
-   # Image Implementation
- 
-   # Image Information
--  // only channel 0 writeable 
-+  // only channel 0 writable
-   i_img_setmask(img, 0x01);
-   int mask = i_img_getmask(img);
-   int channels = i_img_getchannels(img);

-- 
Debian packaging of libimager-perl