From 3699016c2f546f653da47f8376c70142887cdfbe Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Wed, 15 Apr 2015 14:05:23 -0400 Subject: [PATCH] LP1444623: Remove "Safe" CPAN dependency from Debian/Ubuntu Makefile.install files Following up on IRC discussion at http://irc.evergreen-ils.org/evergreen/2015-04-15#i_170386 it was agreed that it is no longer necessary to install Safe from CPAN since it is included in the standard Perl package. Signed-off-by: Chris Sharp Signed-off-by: Ben Shum Conflicts: Open-ILS/src/extras/install/Makefile.debian-jessie --- Open-ILS/src/extras/install/Makefile.debian-jessie | 1 - Open-ILS/src/extras/install/Makefile.debian-wheezy | 1 - Open-ILS/src/extras/install/Makefile.ubuntu-precise | 1 - Open-ILS/src/extras/install/Makefile.ubuntu-trusty | 1 - 4 files changed, 4 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie index d1d60e3903..f392b6955c 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-jessie +++ b/Open-ILS/src/extras/install/Makefile.debian-jessie @@ -84,7 +84,6 @@ export DEB_APACHE_DISMODS = \ export CPAN_MODULES = \ Business::OnlinePayment::PayPal \ - Safe \ Email::Send export CPAN_MODULES_FORCE = \ diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy index f222d5ccac..9720e3073c 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-wheezy +++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy @@ -81,7 +81,6 @@ export CPAN_MODULES = \ Excel::Writer::XLSX \ Business::OnlinePayment::PayPal \ Template::Plugin::POSIX \ - Safe export CPAN_MODULES_FORCE = \ Business::Stripe \ diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-precise b/Open-ILS/src/extras/install/Makefile.ubuntu-precise index 4865754491..86a939ad10 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-precise +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-precise @@ -85,7 +85,6 @@ export CPAN_MODULES = \ Business::OnlinePayment::PayPal \ Template::Plugin::POSIX \ Rose::URI \ - Safe export CPAN_MODULES_FORCE = \ Business::Stripe \ diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty index 0e1be4b783..a8a7d521c0 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty @@ -89,7 +89,6 @@ export DEB_APACHE_DISCONF = \ export CPAN_MODULES = \ Business::CreditCard::Object \ Business::OnlinePayment::PayPal \ - Safe export CPAN_MODULES_FORCE = \ Business::Stripe \ -- 2.11.0