From: Chris Sharp <csharp@georgialibraries.org>
Date: Fri, 5 Feb 2021 19:01:06 +0000 (-0500)
Subject: LP#1863252 - Use APT for Perl dependencies where possible.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bb22b04c5533c94f356155b853dbcb8bdb5c4cd3;p=Evergreen.git

LP#1863252 - Use APT for Perl dependencies where possible.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Jason Etheridge <jason@EquinoxInitiative.org>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---

diff --git a/Open-ILS/src/extras/install/Makefile.debian-buster b/Open-ILS/src/extras/install/Makefile.debian-buster
index fd7b42479c..0222574162 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-buster
+++ b/Open-ILS/src/extras/install/Makefile.debian-buster
@@ -41,6 +41,8 @@ export DEBS = \
 	libemail-mime-perl\
 	libexcel-writer-xlsx-perl\
 	libgd-graph3d-perl\
+	libgeo-coder-googlev3-perl\
+	libgeo-coder-osm-perl\
 	liblocale-maketext-lexicon-perl\
 	liblog-log4perl-perl\
 	libmarc-charset-perl \
@@ -95,8 +97,6 @@ export DEB_APACHE_DISCONF = \
 
 export CPAN_MODULES = \
 	Geo::Coder::Free \
-	Geo::Coder::OSM \
-	Geo::Coder::Google \
 	Business::OnlinePayment::PayPal \
 	Email::Send
 
diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 122aeb0e39..e79c709e13 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -41,6 +41,8 @@ export DEBS = \
 	libemail-mime-perl\
 	libexcel-writer-xlsx-perl\
 	libgd-graph3d-perl\
+	libgeo-coder-googlev3-perl\
+	libgeo-coder-osm-perl\
 	liblocale-maketext-lexicon-perl\
 	liblog-log4perl-perl\
 	libmarc-charset-perl \
@@ -96,8 +98,6 @@ export DEB_APACHE_DISCONF = \
 
 export CPAN_MODULES = \
 	Geo::Coder::Free \
-	Geo::Coder::OSM \
-	Geo::Coder::Google \
 	Business::OnlinePayment::PayPal \
 	Email::Send
 
diff --git a/Open-ILS/src/extras/install/Makefile.debian-stretch b/Open-ILS/src/extras/install/Makefile.debian-stretch
index 1c14bc4f49..2964b473a3 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-stretch
+++ b/Open-ILS/src/extras/install/Makefile.debian-stretch
@@ -41,6 +41,8 @@ export DEBS = \
 	libemail-mime-perl\
 	libexcel-writer-xlsx-perl\
 	libgd-graph3d-perl\
+	libgeo-coder-googlev3-perl\
+	libgeo-coder-osm-perl\
 	liblocale-maketext-lexicon-perl\
 	liblog-log4perl-perl\
 	libmarc-charset-perl \
@@ -95,8 +97,6 @@ export DEB_APACHE_DISCONF = \
 
 export CPAN_MODULES = \
 	Geo::Coder::Free \
-	Geo::Coder::OSM \
-	Geo::Coder::Google \
 	Business::OnlinePayment::PayPal \
 	Email::Send
 
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
index 815fdad145..ab6bfbc4fa 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
@@ -40,6 +40,8 @@ export DEBS = \
 	libemail-mime-perl\
 	libexcel-writer-xlsx-perl\
 	libgd-graph3d-perl\
+	libgeo-coder-googlev3-perl\
+	libgeo-coder-osm-perl\
 	liblocale-maketext-lexicon-perl\
 	liblog-log4perl-perl\
 	libncurses5-dev\
@@ -91,8 +93,6 @@ export DEB_APACHE_DISCONF = \
 
 export CPAN_MODULES = \
 	Geo::Coder::Free \
-	Geo::Coder::OSM \
-	Geo::Coder::Google \
 	Business::OnlinePayment::PayPal \
 	Email::Send \
 	MARC::Charset \
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-focal b/Open-ILS/src/extras/install/Makefile.ubuntu-focal
index 0617dc79b0..e4d06ff63d 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-focal
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-focal
@@ -40,6 +40,8 @@ export DEBS = \
 	libemail-mime-perl\
 	libexcel-writer-xlsx-perl\
 	libgd-graph3d-perl\
+	libgeo-coder-googlev3-perl\
+	libgeo-coder-osm-perl\
 	liblocale-maketext-lexicon-perl\
 	liblog-log4perl-perl\
 	libncurses5-dev\
@@ -91,8 +93,6 @@ export DEB_APACHE_DISCONF = \
 
 export CPAN_MODULES = \
 	Geo::Coder::Free \
-	Geo::Coder::OSM \
-	Geo::Coder::Google \
 	Business::OnlinePayment::PayPal \
 	Email::Send \
 	MARC::Charset \