[SCM] Debian packaging of libimager-perl branch, master, updated. 57c1a9268db224207bd59c58bda26401f8f945b6

[gregor herrmann]

The following commit has been merged in the master branch:
commit 57c1a9268db224207bd59c58bda26401f8f945b6
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Aug 26 00:08:58 2011 +0200

    Don't build T1-fonts format anymore, t1lib is going away.
    
    Remove build dependency on libt1-dev, and add a patch to make sure we don't
    build/install Type1 font support even if t1lib is present.
    
    Closes: #638762

diff --git a/debian/control b/debian/control
index 6722fbe..e25da35 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: perl, debhelper (>= 8),
  libpng12-dev,
  libjpeg-dev,
  libfreetype6-dev,
- libt1-dev,
  libtest-pod-perl,
  libtest-pod-coverage-perl,
  libinline-perl
diff --git a/debian/patches/no_t1lib.patch b/debian/patches/no_t1lib.patch
new file mode 100644
index 0000000..7c3d7e9
--- /dev/null
+++ b/debian/patches/no_t1lib.patch
@@ -0,0 +1,20 @@
+Description: make sure we don't build/include the T1-fonts format, even if libt1-dev is installed
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/638762
+Forwarded: not-needed
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-08-25
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1003,8 +1003,9 @@
+   $pm{"Imager.pm"} = "$instbase/Imager.pm";
+ 
+   my $mani = maniread();
++  my @mani_no_t1 = grep(!/(?:T1|Type1)/, keys %{$mani});
+ 
+-  for my $filename (keys %$mani) {
++  for my $filename (@mani_no_t1) {
+     if ($filename =~ m!^lib/! && $filename =~ /\.(pm|pod)$/) {
+       (my $work = $filename) =~ s/^lib//;
+       $pm{$filename} = $instbase . $work;
diff --git a/debian/patches/series b/debian/patches/series
index ade23d6..68eea7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 nonfree_tests.patch
 spelling.patch
+no_t1lib.patch

-- 
Debian packaging of libimager-perl