This is an automated email from the git hooks/post-receive script. dkogan-guest pushed a commit to branch master in repository libalien-gnuplot-perl.
commit 02b3be810384480ae2eb96fac7a92a5616d0575e Author: Dima Kogan <[email protected]> Date: Wed Aug 27 22:53:49 2014 -0700 imported Makefile-declawing patch --- debian/patches/0001-declawed-Makefile.PL.patch | 236 +++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 237 insertions(+) diff --git a/debian/patches/0001-declawed-Makefile.PL.patch b/debian/patches/0001-declawed-Makefile.PL.patch new file mode 100644 index 0000000..913808a --- /dev/null +++ b/debian/patches/0001-declawed-Makefile.PL.patch @@ -0,0 +1,236 @@ +From: Dima Kogan <[email protected]> +Date: Wed, 27 Aug 2014 22:52:36 -0700 +Subject: declawed Makefile.PL +Forwarded: not-needed + +Makefile.PL no longer tries to install gnuplot. Debian can do that for us +--- + Makefile.PL | 208 ------------------------------------------------------------ + 1 file changed, 208 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 9e7846f..b3eefd3 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -26,213 +26,6 @@ sub MY::libscan + } + + +-######################################## +-######################################## +-# reroute the main POD into a separate README.pod if requested. This is here +-# purely to generate a README.pod for the github front page +-my $POD_header = <<EOF; +-=head1 OVERVIEW +- +-Alien::Gnuplot is intended for distribution via CPAN. This repository +-stores the history for the Alien::Gnuplot module on CPAN. Install the +-module via CPAN. +- +-=cut +-EOF +-if(exists $ARGV[0] && $ARGV[0] eq 'README.pod') +-{ +- open MOD, 'lib/Alien/Gnuplot.pm' or die "Couldn't open main module"; +- open README, '>README.pod' or die "Couldn't open README.pod"; +- +- print README $POD_header; +- +- while (<MOD>) +- { +- if (/^=/../^=cut/) +- { print README; } +- } +-} +- +- +-################################################################################ +-################################################################################ +-## Here we check for a working gnuplot. What better way to do that than by +-## executing our own library? +- +-{ +- my $get_msg = ''; +- +- eval q{ do q{./lib/Alien/Gnuplot.pm}; $get_msg = $@;}; +- +- unless($get_msg) { +- if($Alien::Gnuplot::GNUPLOT_RECOMMENDED_VERSION > $Alien::Gnuplot::version) { +- $get_msg = qq{ +-Gnuplot seems to exist on your system, but it is version $Alien::Gnuplot::version. +-The minimum recommended version is $Alien::Gnuplot::GNUPLOT_RECOMMENDED_VERSION. +- +-} +- } +- +- } +- +- if($get_msg) { +- print $get_msg ; +- +- my $install_flag; +- +- if( (-t STDIN or $^O =~ m/MSWin/) and +- ! ( $ENV{AUTOMATED_TESTING} or $ENV{PERL_MM_USE_DEFAULT} ) +- ) { +- +- print "\nGnuplot seems to not exist on your system. Shall I try to install it? [Y/n]> "; +- $a = <STDIN>; +- $install_flag = !($a =~ m/^\s*n/i); +- +- unless($install_flag) { +- print qq{ +- +-Okay, I won't install gnuplot. You can still install the Alien::Gnuplot module, +-but it will fail on load until you install the gnuplot executable yourself. +- +-}; +- } +- +- } else { +- +- if($ENV{PERL_MM_USE_DEFAULT}) { +- $install_flag = 1; +- print qq{ +- +-Gnuplot seems to not exist oon your system, and you set PERL_MM_USE_DEFAULT -- +-so I'll try to install it for you. +- +-}; +- } else { +- print qq{ +- +-Gnuplot seems to not exist on your system, and this is not an interactive +-session, so I can't ask if you want to install it. I'll install the module, +-but it'll fail on load until you install the gnuplot executable yourself. +- +-}; +- } +- } +- +- if($install_flag) { +- +- print "Attempting to install/upgrade gnuplot on your system....\n\n"; +- +- if( install_gnuplot_binary() ) { +- print "\nGnuplot installation was successful!\n"; +- } else { +- die qq{ +- +-Couldn't find gnuplot, and couldn't get it from the standard package managers. +-I'd try to download the packages from sourceforge, but there are roadblocks that +-make it hard to automate. +- +-You can get gnuplot from the DOWNLOAD link here: "http://gnuplot.info";. +- +-}; +- } # end of binary conditional +- } # end of prompt conditional +- } # end of get_msg condition +-} # end of convenience block +- +-############################## +-############################## +-## +-## install_gnuplot_binary routine -- called +-## from deep in the install conditional above. +-## +-## The strategy is to try to get a late-model +-## binary from the Usual Suspects, and fall back +-## to compiling it. +-## +-## On success, return 1; on failure return 0. +-## Try not to crash. +- +-sub install_gnuplot_binary { +- local($|) = 1; +- +- ############################## +- # +- if($^O eq 'darwin') { +- ############################## +- # Binary distros on mac - try macports, fink, homebrew +- for my $manager( ['macports','port','http://macports.org'], +- ['fink','fink','http://www.finkproject.org'], +- ['homebrew','brew','http://mxcl.github.com/homebrew/'] +- ) { +- print "Trying $manager->[0] (you can get it at $manager->[2])..."; +- my $l = `which $manager->[1]`; +- if($l) { +- print "\n"; +- print STDERR `$manager->[1] install gnuplot`; +- my $msg; +- eval q{ do q{lib/Alien/Gnuplot.pm}; $msg = $@; } ; +- +- if( (!$msg) and ($Alien::Gnuplot::version >= $Alien::Gnuplot::GNUPLOT_RECOMMENDED_VERSION)) { +- print "Success!\n"; +- return 1; # Success - return 1 +- } else { +- return 0; # Failure - give up (once you find one package manager don't use any other) +- } +- +- } else { +- print "no $manager->[0]\n"; +- } +- } # end of manager loop +- +- return 0; +- } # end of macos case +- +- elsif($^O eq 'linux') { +- # The linux package managers generally ask for keyboard feedback (e.g. yum), +- # so we have to spawn, exec, and wait to make sure the manager gets that feedback. +- +- for my $manager( 'yum','apt-get' ) { +- print "Trying $manager..."; +- my $l = `which $manager`; +- +- if($l) { +- +- my $pid = fork(); +- die "Couldn't fork!" unless(defined($pid)); +- +- unless($pid) { +- ## daughter +- exec "$manager install gnuplot"; +- +- exit(-1); # never get here +- } +- +- waitpid($pid,0); # wait for the install to finish +- +- my $msg; +- eval q{ do q{lib/Alien/Gnuplot.pm}; $msg = $@ }; +- +- if( (!$msg) and ($Alien::Gnuplot::version >= $Alien::Gnuplot::GNUPLOT_RECOMMENDED_VERSION) ) { +- print "Success!\n"; +- return 1; # Success - return 1 +- } else { +- print "Hmmm, that didn't seem to work.\n"; +- return 0; # Failure - give up (once you find one package manager don't use any other) +- } +- } # end of found-this-manager conditional +- } # end of manager loop +- +- return 0; +- } # end of linux case +- +- else { +- return 0; ## We're not a system where we know how to do binary installs +- } +- +-} +- +- +- + ############################## + ############################## + ## Write a generic Makefile that puts the module in place. Include a postamble +@@ -248,7 +41,6 @@ WriteMakefile( + : ()), + PREREQ_PM => { 'Time::HiRes' => 0, + 'File::Temp' => 0, +- 'HTTP::Tiny' => 0, + 'POSIX' => 0, + 'File::Spec' => 0 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..322ee81 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-declawed-Makefile.PL.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libalien-gnuplot-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
