This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pdl.
commit 210443560fbb577eebe25747415690b5f3ab562a Author: Bas Couwenberg <[email protected]> Date: Fri Jun 17 17:34:57 2016 +0200 Drop obsolete patches. --- .../patches/build-pdl-wrapper-via-makefile.patch | 58 ------------- debian/patches/fix_manifest.patch | 24 ------ debian/patches/fix_pod2man_errors.patch | 95 ---------------------- debian/patches/gsl-2.patch | 44 ---------- debian/patches/series | 4 - 5 files changed, 225 deletions(-) diff --git a/debian/patches/build-pdl-wrapper-via-makefile.patch b/debian/patches/build-pdl-wrapper-via-makefile.patch deleted file mode 100644 index e1ca960..0000000 --- a/debian/patches/build-pdl-wrapper-via-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -508,7 +508,7 @@ - my $cleanup = 'pdl perldl pdldoc pdldoc.db pdldoc.pod perldl.pod '; - - if($^O !~ /mswin32/i) { -- $cleanup = 'pdl.c ' . $cleanup; -+ $cleanup = 'pdl.c pdl.o ' . $cleanup; - } - - -@@ -709,6 +709,21 @@ - - if($Config{make} =~ /\bdmake/i) { - foreach $target (@$list) { -+ if ($target eq 'pdl') { -+ next if ($^O =~ /mswin32/i); -+ push @m, " -+all :: $target -+ \$(NOECHO) \$(NOOP) -+ -+$target: $target.o -+ mkdir -p blib/bin -+ \$(LD) -o blib/bin/$target $target.o -+ -+$target.c: $plfile -+ \$(PERLRUNINST) $plfile $target -+"; -+ next; -+ } - push @m, " - all :: $target - \$(NOECHO) \$(NOOP) -@@ -726,7 +741,9 @@ - # why it still doesn't. (CED 2012-11-12) - my $compilestr; - if($plfile eq "pdl.PL" && $Config{make} !~ /\bnmake/i) { -- $compilestr = "\n\t\$(CC) -o pdl pdl.c\n"; -+ $compilestr = "\n\t\$(CC) \$(CFLAGS) \$(CPPFLAGS) -c -o pdl.o pdl.c\n"; -+ $compilestr.= "\t\$(LD) -o pdl pdl.o\n"; -+ $compilestr.= "\tcp -a pdl blib/bin\n"; - } else { - $compilestr = ""; - } ---- a/pdl.PL -+++ b/pdl.PL -@@ -84,11 +84,4 @@ - nosubs - ; - --use Config; --my $dir = 'blib/bin'; --#manually create directory. Older versions of EU::MM (at least as late --#as 6.17 which ships with perl 5.8.6) don't automatically create it. --mkdir $dir unless -e $dir && -d $dir; --`$Config{cc} -o $dir/pdl pdl.c`; -- - exit 0; diff --git a/debian/patches/fix_manifest.patch b/debian/patches/fix_manifest.patch deleted file mode 100644 index 8d655cd..0000000 --- a/debian/patches/fix_manifest.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/MANIFEST -+++ b/MANIFEST -@@ -650,8 +650,6 @@ - debian/copyright - debian/dh_pdl - debian/f77conf.pl --debian/fix_man_encoding.sed --debian/fix_man_name.sed - debian/patches/series - debian/pdl.dirs - debian/pdl.doc-base ---- a/MANIFEST.SKIP -+++ b/MANIFEST.SKIP -@@ -267,3 +267,10 @@ - ~$ - ^work - ^pdl.*-log.txt$ -+^\.pc/.*$ -+^debian/pdl/.*$ -+^debian/dh_pdl\.1$ -+^debian/files$ -+^debian/pdl\.debhelper\.log$ -+^debian/pdl\..*\.debhelper$ -+^debian/pdl\.substvars$ diff --git a/debian/patches/fix_pod2man_errors.patch b/debian/patches/fix_pod2man_errors.patch deleted file mode 100644 index c5ec87f..0000000 --- a/debian/patches/fix_pod2man_errors.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/Basic/Pod/PP.pod -+++ b/Basic/Pod/PP.pod -@@ -347,7 +347,7 @@ - For the above situation, my compiler tells me: - - ... -- test.pd:15: error: ‘rmp’ undeclared (first use in this function) -+ test.pd:15: error: 'rmp' undeclared (first use in this function) - ... - - In my example script (called test.pd), line 15 is exactly the line at which ---- a/Basic/Complex/complex.pd -+++ b/Basic/Complex/complex.pd -@@ -20,6 +20,8 @@ - - - pp_addpm {At => Top}, <<'EOD'; -+=encoding utf8 -+ - =head1 NAME - - PDL::Complex - handle complex numbers -@@ -72,7 +74,7 @@ - - =item * - --This module has received some testing by Vanuxem Gr�gory -+This module has received some testing by Vanuxem Grégory - (g.vanuxem at wanadoo dot fr). Please report any other errors you - come across! - ---- a/Lib/Func.pm -+++ b/Lib/Func.pm -@@ -1,3 +1,4 @@ -+=encoding utf-8 - - =head1 NAME - -@@ -931,7 +932,7 @@ - to form C<PDL::Func>. Comments greatly appreciated on the - current implementation, as it is not too sensible. - --Thanks to Robin Williams, Halld�r Olafsson, and Vince McIntyre. -+Thanks to Robin Williams, Halldór Olafsson, and Vince McIntyre. - - =head1 AUTHOR - ---- a/Basic/Slices/slices.pd -+++ b/Basic/Slices/slices.pd -@@ -169,7 +169,7 @@ - dimension and C<$ind> has more than 0 dimensions, they must agree in - a threading sense. - --C<index1d> uses a single active dim in C<$ind> to produce a list of -+=item C<index1d> uses a single active dim in C<$ind> to produce a list of - indexed values in the 0 dim of the output - it is useful for - collapsing C<$source> by indexing with a single row of values long - C<$source>'s 0 dimension. The output has the same number of dims as -@@ -178,11 +178,13 @@ - C<$ind> and $<source> both have more than 1 dim, then all dims higher - than 0 must agree in a threading sense. - --C<index2d> works like C<index> but uses separate piddles for X and Y -+=item C<index2d> works like C<index> but uses separate piddles for X and Y - coordinates. For more general N-dimensional indexing, see the - L<PDL::NiceSlice> syntax or L<PDL::Slices> (in particular C<slice>, - C<indexND>, and C<range>). - -+=back -+ - These functions are two-way, i.e. after - - $c = $a->index(pdl[0,5,8]); ---- a/Lib/Transform/Cartography/Cartography.pm -+++ b/Lib/Transform/Cartography/Cartography.pm -@@ -323,7 +323,7 @@ - - =item dup - if true, the meridian at the far boundary is duplicated. - --==back -+=back - - =cut - ---- a/Basic/Ufunc/ufunc.pd -+++ b/Basic/Ufunc/ufunc.pd -@@ -801,7 +801,7 @@ - percentile must be between 0.0 and 1.0. When the specified percentile - falls between two values, the nearest data value is the result. - The algorithm implemented is from the textbook version described --first at L< http://en.wikipedia.org/wiki/Percentile>. -+first at L<http://en.wikipedia.org/wiki/Percentile>. - - By using L<xchg|PDL::Slices/xchg> etc. it is possible to use - I<any> dimension. diff --git a/debian/patches/gsl-2.patch b/debian/patches/gsl-2.patch deleted file mode 100644 index d3e1853..0000000 --- a/debian/patches/gsl-2.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: Add support for gsl_sf_ellint_D() call with GSL 2.x. -Author: Sisyphus (http://sourceforge.net/u/userid-1195342/profile/) -Origin: http://sourceforge.net/p/pdl/bugs/_discuss/thread/24953813/f256/attachment/gsl_sf_ellint.pd.diff -Bug: http://sourceforge.net/p/pdl/bugs/407/ -Bug-Debian: https://bugs.debian.org/805824 - ---- a/Lib/GSL/SF/ellint/gsl_sf_ellint.pd -+++ b/Lib/GSL/SF/ellint/gsl_sf_ellint.pd -@@ -82,6 +82,10 @@ $e() = r.err; - Doc =>'Legendre form of incomplete elliptic integrals P(phi,k,n) = Integral[(1 + n Sin[t]^2)^(-1)/Sqrt[1 - k^2 Sin[t]^2], {t, 0, phi}]' - ); - -+my $v = `gsl-config --version`; -+ -+if($v < 2.0) { -+ - pp_def('gsl_sf_ellint_D', - GenericTypes => [D], - Pars=>'double phi(); double k(); double n(); -@@ -95,6 +99,24 @@ $e() = r.err; - Doc =>'Legendre form of incomplete elliptic integrals D(phi,k,n)' - ); - -+} -+else { -+ -+pp_def('gsl_sf_ellint_D', -+ GenericTypes => [D], -+ Pars=>'double phi(); double k(); -+ double [o]y(); double [o]e()', -+ Code =>' -+gsl_sf_result r; -+GSLERR(gsl_sf_ellint_D_e,($phi(),$k(),GSL_PREC_DOUBLE,&r)) -+$y() = r.val; -+$e() = r.err; -+', -+ Doc =>'Legendre form of incomplete elliptic integrals D(phi,k)' -+ ); -+ -+} -+ - pp_def('gsl_sf_ellint_RC', - GenericTypes => [D], - Pars=>'double x(); double yy(); double [o]y(); double [o]e()', diff --git a/debian/patches/series b/debian/patches/series index 95fbf9f..c264ba1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,13 +1,9 @@ -#build-pdl-wrapper-via-makefile.patch -#fix_pod2man_errors.patch #callext_compile_options.patch #doc_dirlist.patch #dumper_gnukfreebsd.patch -#fix_manifest.patch #testsuite_fixes.patch #slatec_default_integer_8.patch #minuit_default_integer_8.patch -#gsl-2.patch doc_vendor_install.patch spelling-errors.patch pdl-cppflags.patch -- 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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
