This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pdl.
commit 3a952001e7132d3103127b542594b3bd99ac8a03 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Jun 19 01:32:29 2016 +0200 Drop remaining obsolete patches. --- debian/patches/callext_compile_options.patch | 17 ---- debian/patches/series | 2 - debian/patches/testsuite_fixes.patch | 118 --------------------------- 3 files changed, 137 deletions(-) diff --git a/debian/patches/callext_compile_options.patch b/debian/patches/callext_compile_options.patch deleted file mode 100644 index ca14cc1..0000000 --- a/debian/patches/callext_compile_options.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/t/callext.t -+++ b/t/callext.t -@@ -34,8 +34,12 @@ - my $out = File::Spec->catfile('t', 'callext.'.$Config{dlext}); - - # Compile the code -- --callext_cc($cfile, "-I$inc", '', $out); -+my $cflags="-I$inc"; -+$cflags.=" $ENV{CPPFLAGS}" if (defined $ENV{CPPFLAGS}); -+$cflags.=" $ENV{CFLAGS}" if (defined $ENV{CFLAGS}); -+my $ldflags=''; -+$ldflags.=" $ENV{LDFLAGS}" if (defined $ENV{LDFLAGS}); -+callext_cc($cfile, $cflags, $ldflags, $out); - - my $y = sequence(5,4)+2; # Create PDL - my $x = $y*20+100; # Another diff --git a/debian/patches/series b/debian/patches/series index 7a193f1..713630e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -#callext_compile_options.patch -#testsuite_fixes.patch doc_vendor_install.patch spelling-errors.patch pdl-cppflags.patch diff --git a/debian/patches/testsuite_fixes.patch b/debian/patches/testsuite_fixes.patch deleted file mode 100644 index a7e819a..0000000 --- a/debian/patches/testsuite_fixes.patch +++ /dev/null @@ -1,118 +0,0 @@ -Index: pdl-2.007/t/config.t -=================================================================== ---- pdl-2.007.orig/t/config.t 2013-05-12 20:09:47.000000000 +0000 -+++ pdl-2.007/t/config.t 2014-09-25 07:43:14.000000000 +0000 -@@ -19,7 +19,7 @@ - local $TODO = 'Known_problem sf.net bug #3030998' if ($PDL::Config{SKIP_KNOWN_PROBLEMS} or exists $ENV{SKIP_KNOWN_PROBLEMS} ); - - # generate list of WITH_* keys from PDL::Config -- my @keys = grep { /^WITH_/ } keys %PDL::Config; -+ my @keys = sort grep { /^WITH_/ } keys %PDL::Config; - foreach my $key ( @keys ) { - # there should be no undef values - ok( defined $PDL::Config{$key} , "check $key in Config.pm" ); -Index: pdl-2.007/t/flexraw_fortran.t -=================================================================== ---- pdl-2.007.orig/t/flexraw_fortran.t 2013-09-14 15:07:45.000000000 +0000 -+++ pdl-2.007/t/flexraw_fortran.t 2014-09-25 09:04:08.959415513 +0000 -@@ -28,6 +28,8 @@ - - my $exec = $^O =~ /win32/i ? '.exe' : ''; - my $null = $^O =~ /win32/i ? ' 2>nul' : ' 2>/dev/null'; -+my $F77; -+my $F77flags; - - BEGIN{ - -@@ -44,13 +46,30 @@ - } elsif ($datalen > 70) { - plan skip_all => "TEMPDIR path too long for f77 ($datalen chars), skipping all tests"; - } else { -- eval " use ExtUtils::F77; "; -- if ( $@ ) { -- plan skip_all => "Skip all tests as ExtUtils::F77 not found"; -- exit 0; -+ if (exists $PDL::Config{F77CONF} && -f $PDL::Config{F77CONF}) { -+ print "loading F77 configuration from $PDL::Config{F77CONF}...\n"; -+ eval "require '$PDL::Config{F77CONF}'"; -+ if ($@ ne "") { -+ plan skip_all => "F77CONF file not loaded"; -+ } -+ $F77 = F77Conf::compiler(); -+ $F77flags = F77Conf::cflags(); - } else { -- plan tests => $ntests; -+ eval " use ExtUtils::F77; "; -+ if ( $@ ) { -+ plan skip_all => "Skip all tests as ExtUtils::F77 not found"; -+ exit 0; -+ } -+ if ($ExtUtils::F77::VERSION > 1.03) { -+ $F77 = ExtUtils::F77::compiler(); -+ $F77flags = ExtUtils::F77::cflags(); -+ } else { -+ $F77 = 'f77'; -+ $F77flags = ''; -+ } -+ - } -+ plan tests => $ntests; - } - - # Configuration -@@ -66,19 +85,6 @@ - - } - --# use ExtUtils::F77; -- --my $F77; --my $F77flags; -- --if ($ExtUtils::F77::VERSION > 1.03) { -- $F77 = ExtUtils::F77::compiler(); -- $F77flags = ExtUtils::F77::cflags(); --} else { -- $F77 = 'f77'; -- $F77flags = ''; --} -- - sub tapprox { - my ($a,$b) = @_; - my $c = abs($a->clump(-1)-$b->clump(-1)); -@@ -271,7 +277,7 @@ - c Program to test i/o of F77 unformatted files - program rawtest - implicit none -- integer i -+ integer*4 i - $f77type a($ndata) - do i = 1, $ndata - a(i) = $val -@@ -353,7 +359,7 @@ - c Program to test i/o of F77 unformatted files - program rawtest - implicit none -- integer i -+ integer*4 i - $f77type a($ndata) - do i = 1, $ndata - a(i) = $val -@@ -403,7 +409,7 @@ - c Program to test i/o of F77 unformatted files - program rawtest - implicit none -- integer i -+ integer*4 i - $f77type a($ndata) - do i = 1, $ndata - a(i) = $val -@@ -457,7 +463,7 @@ - c Program to test i/o of F77 unformatted files - program rawtest - implicit none -- integer i, j -+ integer*4 i, j - $f77type a($ndata, $ndata) - do i = 1, $ndata - do j = 1, $ndata -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pdl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits