[pdl] 03/05: Drop patches applied upstream. Refresh remaining patches.
Bas Couwenberg
sebastic at debian.org
Sat May 27 10:31:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pdl.
commit 93d817356c09ee7f93fc169202f93241c77ceb88
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat May 27 11:21:54 2017 +0200
Drop patches applied upstream. Refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/disable-doc-install.patch | 2 +-
.../patches/manpage-has-errors-from-pod2man.patch | 15 --
debian/patches/pdl-ldflags.patch | 2 +-
debian/patches/series | 2 -
debian/patches/spelling-errors.patch | 208 ---------------------
6 files changed, 3 insertions(+), 227 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b247c07..eebc4d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pdl (1:2.018-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Drop patches applied upstream. Refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Sat, 27 May 2017 11:20:06 +0200
diff --git a/debian/patches/disable-doc-install.patch b/debian/patches/disable-doc-install.patch
index 6378a7b..909f08c 100644
--- a/debian/patches/disable-doc-install.patch
+++ b/debian/patches/disable-doc-install.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -538,29 +538,29 @@ sub MY::postamble {
+@@ -539,29 +539,29 @@ sub MY::postamble {
package MY;
my $text =
'
diff --git a/debian/patches/manpage-has-errors-from-pod2man.patch b/debian/patches/manpage-has-errors-from-pod2man.patch
deleted file mode 100644
index 92bb714..0000000
--- a/debian/patches/manpage-has-errors-from-pod2man.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix pod2man errors for empty parameter values.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://sourceforge.net/p/pdl/bugs/429/
-
---- a/Lib/Transform/Proj4/Proj4.pd
-+++ b/Lib/Transform/Proj4/Proj4.pd
-@@ -469,7 +469,7 @@ ENDTEMPLATE
- {
- $doc_param_list .= "\nProjection Parameters\n\n=for options\n\n=over 4\n\n";
- foreach my $param ( sort @{ $projection->{PARAMS}->{PROJ} } )
-- { $doc_param_list .= "=item $param\n\n"; }
-+ { next if(!$param); $doc_param_list .= "=item $param\n\n"; }
- $doc_param_list .= "=back\n\n";
- }
-
diff --git a/debian/patches/pdl-ldflags.patch b/debian/patches/pdl-ldflags.patch
index 4c79388..4621467 100644
--- a/debian/patches/pdl-ldflags.patch
+++ b/debian/patches/pdl-ldflags.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -583,7 +583,7 @@ EOPS
+@@ -584,7 +584,7 @@ EOPS
# support the `$<` variable in explicit rules
$text .= <<EOT if $^O !~ /MSWin/;
pdl$Config::Config{exe_ext} : pdl.c
diff --git a/debian/patches/series b/debian/patches/series
index b383203..317573d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ minuit_default_integer_8.patch
disable-doc-install.patch
pdl-ldflags.patch
absolute-doc-paths.patch
-spelling-errors.patch
-manpage-has-errors-from-pod2man.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 75bba73..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Description: Fix spelling errors.
- * ommitting -> omitting
- * dirctory -> directory
- * conviniently -> conveniently
- * particulary -> particularly
- * avaible -> available
- * beetween -> between
- * evry -> every
- * routins -> routines
- * countour -> contour
- * colums -> columns
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://sourceforge.net/p/pdl/patches/85/
-Applied-Upstream: https://sourceforge.net/p/pdl/code/ci/b6abd2a3ce0ad1efc8e07d54f5224580111325c7/
-
---- a/Basic/Pod/Modules.pod
-+++ b/Basic/Pod/Modules.pod
-@@ -7,7 +7,7 @@ PDL::Modules - A guide to PDL's module r
-
- This page serves as a table of contents for PDL's module documentation.
- This page does not list every single PDL module. It only shows the ones
--intended for PDL users, while ommitting those which are deemed "for
-+intended for PDL users, while omitting those which are deemed "for
- internal use only". If you wish to see a comprehensive list of all
- documentation, please see the L<PDL::Index|PDL::Index> page.
-
---- a/Basic/AutoLoader.pm
-+++ b/Basic/AutoLoader.pm
-@@ -29,7 +29,7 @@ B<Note>: This variable is unrelated to P
-
- If you add a leading '+' on a directory name, PDL will search the
- entire directory tree below that point. Internally, PDL stores the
--dirctory list in the variable C<@PDLLIB>, which can be modified at
-+directory list in the variable C<@PDLLIB>, which can be modified at
- run time.
-
- For example, in csh:
---- a/Basic/Complex/complex.pd
-+++ b/Basic/Complex/complex.pd
-@@ -59,7 +59,7 @@ not the "highest" (for some definition)
-
- C<i> is a constant exported by this module, which represents
- C<-1**0.5>, i.e. the imaginary unit. it can be used to quickly and
--conviniently write complex constants like this: C<4+3*i>.
-+conveniently write complex constants like this: C<4+3*i>.
-
- =item *
-
---- a/GENERATED/PDL/Complex.pm
-+++ b/GENERATED/PDL/Complex.pm
-@@ -67,7 +67,7 @@ not the "highest" (for some definition)
-
- C<i> is a constant exported by this module, which represents
- C<-1**0.5>, i.e. the imaginary unit. it can be used to quickly and
--conviniently write complex constants like this: C<4+3*i>.
-+conveniently write complex constants like this: C<4+3*i>.
-
- =item *
-
---- a/Basic/Core/Core.pm
-+++ b/Basic/Core/Core.pm
-@@ -638,7 +638,7 @@ latter will just 'fall through' if the a
- already a piddle. It will return a reference and I<NOT>
- a new copy.
-
--This is particulary useful if you are writing a function
-+This is particularly useful if you are writing a function
- which is doing some fiddling with internals and assumes
- a piddle argument (e.g. for method calls). Using C<topdl()>
- will ensure nothing breaks if passed with '2'.
---- a/GENERATED/PDL/GSL/RNG.pm
-+++ b/GENERATED/PDL/GSL/RNG.pm
-@@ -53,7 +53,7 @@ in the GNU Scientific Library.
-
- The new method initializes a new instance of the RNG.
-
--The avaible RNGs are:
-+The available RNGs are:
-
- coveyou cmrg fishman18 fishman20 fishman2x gfsr4 knuthran
- knuthran2 knuthran2002 lecuyer21 minstd mrg mt19937 mt19937_1999
-@@ -163,7 +163,7 @@ Example:
-
- This function creates a piddle with given dimensions or accept an
- existing piddle and fills it. get() returns integer values
--beetween a minimum and a maximum specific to evry RNG.
-+between a minimum and a maximum specific to every RNG.
-
- Usage:
-
-@@ -185,7 +185,7 @@ Example:
-
- This function creates a piddle with given dimensions or accept an
- existing piddle and fills it. get_int() returns integer values
--beetween 0 and $max.
-+between 0 and $max.
-
- Usage:
-
---- a/Lib/GSL/RNG/gsl_random.pd
-+++ b/Lib/GSL/RNG/gsl_random.pd
-@@ -35,7 +35,7 @@ in the GNU Scientific Library.
-
- The new method initializes a new instance of the RNG.
-
--The avaible RNGs are:
-+The available RNGs are:
-
- coveyou cmrg fishman18 fishman20 fishman2x gfsr4 knuthran
- knuthran2 knuthran2002 lecuyer21 minstd mrg mt19937 mt19937_1999
-@@ -145,7 +145,7 @@ Example:
-
- This function creates a piddle with given dimensions or accept an
- existing piddle and fills it. get() returns integer values
--beetween a minimum and a maximum specific to evry RNG.
-+between a minimum and a maximum specific to every RNG.
-
- Usage:
-
-@@ -167,7 +167,7 @@ Example:
-
- This function creates a piddle with given dimensions or accept an
- existing piddle and fills it. get_int() returns integer values
--beetween 0 and $max.
-+between 0 and $max.
-
- Usage:
-
---- a/Graphics/PGPLOT/Window/Window.pm
-+++ b/Graphics/PGPLOT/Window/Window.pm
-@@ -1296,7 +1296,7 @@ in the FITS header of the image.
- $win->fits_cont( image, [$contours, $transform, $misval], [$opt] )
-
- Does the same thing for the L<cont|/cont> routine that
--L<fits_imag|/fits_imag> does for the L<imag|/imag> routins.
-+L<fits_imag|/fits_imag> does for the L<imag|/imag> routines.
-
- =head2 draw_wedge
-
---- a/Graphics/TriD/TriD/Contours.pm
-+++ b/Graphics/TriD/TriD/Contours.pm
-@@ -182,7 +182,7 @@ Add labels to a contour plot
- $contour->addlabels($labelint,$segint,$font);
-
- $labelint is the integer interval between labeled contours. If you
--have 8 countour levels and specify $labelint=3 addlabels will attempt
-+have 8 contour levels and specify $labelint=3 addlabels will attempt
- to label the 1st, 4th, and 7th contours. $labelint defaults to 1.
-
- $segint specifies the density of labels on a single contour
---- a/GENERATED/PDL/IO/Misc.pm
-+++ b/GENERATED/PDL/IO/Misc.pm
-@@ -264,7 +264,7 @@ arrays (also see L</rgrep>).
- For each column number specified, a 1D output PDL will be
- generated. Anonymous arrays of column numbers generate
- 2D output piddles with dim0 for the column data and dim1
--equal to the number of colums in the anonymous array(s).
-+equal to the number of columns in the anonymous array(s).
-
- An empty anonymous array as column specification will
- produce a single output data piddle with dim(1) equal
-@@ -308,7 +308,7 @@ Options (case insensitive):
- to be read in. Any missing columns use the DEFTYPE value (default B<[]>).
-
- COLSEP
-- - splits on this string/pattern/qr{} between colums of data. Defaults to
-+ - splits on this string/pattern/qr{} between columns of data. Defaults to
- $PDL::IO::Misc::defcolsep.
-
- PERLCOLS
-@@ -818,7 +818,7 @@ Can take file name or *HANDLE, and if no
- HEADER - prints this string before the data. If the string
- is not terminated by a newline, one is added. (default B<''>).
-
-- COLSEP - prints this string between colums of data. Defaults to
-+ COLSEP - prints this string between columns of data. Defaults to
- $PDL::IO::Misc::defcolsep.
-
- FORMAT - A printf-style format string that is cycled through
---- a/IO/Misc/misc.pd
-+++ b/IO/Misc/misc.pd
-@@ -237,7 +237,7 @@ arrays (also see L</rgrep>).
- For each column number specified, a 1D output PDL will be
- generated. Anonymous arrays of column numbers generate
- 2D output piddles with dim0 for the column data and dim1
--equal to the number of colums in the anonymous array(s).
-+equal to the number of columns in the anonymous array(s).
-
- An empty anonymous array as column specification will
- produce a single output data piddle with dim(1) equal
-@@ -281,7 +281,7 @@ Options (case insensitive):
- to be read in. Any missing columns use the DEFTYPE value (default B<[]>).
-
- COLSEP
-- - splits on this string/pattern/qr{} between colums of data. Defaults to
-+ - splits on this string/pattern/qr{} between columns of data. Defaults to
- $PDL::IO::Misc::defcolsep.
-
- PERLCOLS
-@@ -791,7 +791,7 @@ Can take file name or *HANDLE, and if no
- HEADER - prints this string before the data. If the string
- is not terminated by a newline, one is added. (default B<''>).
-
-- COLSEP - prints this string between colums of data. Defaults to
-+ COLSEP - prints this string between columns of data. Defaults to
- $PDL::IO::Misc::defcolsep.
-
- FORMAT - A printf-style format string that is cycled through
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pdl.git
More information about the Pkg-perl-cvs-commits
mailing list