[SCM] Debian packaging of libimager-perl branch, master, updated. 2bd8b689e6879b66822ee36c506be6cf6447bc96

[gregor herrmann]

The following commit has been merged in the master branch:
commit 8e98c7eff20a310b47e6989b8394a8a83c442250
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Aug 29 21:12:36 2011 +0200

    Don't build T1-fonts format anymore, t1lib is going away.
    
    Remove build dependency on libt1-dev, and patch T1/Makefile.PL to make sure
    we don't build/install Type1 font support even if t1lib is present.
    Remove Imager::Font::Type1 files (wrapper around ::T1).
    
    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..355e583
--- /dev/null
+++ b/debian/patches/no_t1lib.patch
@@ -0,0 +1,18 @@
+Description: pretend we can't build the T1lib module, even if libt1-dev is installed
+Origin: vendor
+Forwarded: no needed
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-08-29
+
+diff --git a/T1/Makefile.PL b/T1/Makefile.PL
+index d773f77..28b7900 100644
+--- a/T1/Makefile.PL
++++ b/T1/Makefile.PL
+@@ -80,6 +80,7 @@ my %probe =
+   );
+ 
+ my $probe_res = Imager::Probe->probe(\%probe);
++undef $probe_res; # we don't want to build the T1 lib, cf. #638762
+ if ($probe_res) {
+   $IMAGER_LIBS{T1} = 1;
+ 
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
diff --git a/debian/rules b/debian/rules
index e1bcd3a..af82980 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,13 @@ PERL   ?= /usr/bin/perl
 override_dh_auto_configure:
 	dh_auto_configure -- --disable=TT-fonts
 
+override_dh_auto_install:
+	dh_auto_install
+	# Imager::Font::Type1 is a wrapper around Imager::Font::T1
+	# which we don't build; cf. #638762
+	$(RM) -v $(TMP)/usr/lib/perl5/Imager/Font/Type1.pm \
+		$(TMP)/usr/share/man/man3/Imager::Font::Type1.3pm
+
 override_dh_installexamples:
 	dh_installexamples
 	sed -i '1s|^#!perl|#!/usr/bin/perl|' $(TMP)/usr/share/doc/libimager-perl/examples/*

-- 
Debian packaging of libimager-perl