[SCM] Debian packaging of libimager-perl branch, master, updated. 47705220adef315da5360ceac02581fd1af9bac8
gregor herrmann
gregoa at debian.org
Mon Aug 29 18:53:47 UTC 2011
The following commit has been merged in the master branch:
commit 47705220adef315da5360ceac02581fd1af9bac8
Author: gregor herrmann <gregoa at debian.org>
Date: Mon Aug 29 20:52:47 2011 +0200
Revert "Don't build T1-fonts format anymore, t1lib is going away."
This reverts commit 57c1a9268db224207bd59c58bda26401f8f945b6.
This doesn't work if libt1-dev is installed :(
diff --git a/debian/control b/debian/control
index e25da35..6722fbe 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ 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
deleted file mode 100644
index 7c3d7e9..0000000
--- a/debian/patches/no_t1lib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 68eea7c..ade23d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
nonfree_tests.patch
spelling.patch
-no_t1lib.patch
--
Debian packaging of libimager-perl
More information about the Pkg-perl-cvs-commits
mailing list