Lp 1936662: Add CPAN Module Prerequisites for Debian and Ubuntu

This commit adds the missing CPAN module prerequisites for the "did
you mean" feature to the PostgreSQL server Makefile targets for Debian
Jessie, Stretch, Buster and Ubuntu Bionic.

They were added to the Makefile target for Ubuntu Focal but were
apparently overlooked in the other distros.

Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-buster b/Open-ILS/src/extras/install/Makefile.debian-buster
index 456a402..623e3a6 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-buster
+++ b/Open-ILS/src/extras/install/Makefile.debian-buster
@@ -105,6 +105,10 @@ export CPAN_MODULES_FORCE = \
        Business::Stripe \
        Class::DBI::Frozen::301
 
+export CPAN_MODULES_PGSQL = \
+       String::KeyboardDistance \
+       Text::Levenshtein::Damerau::XS
+
 PGSQL_SERVER_DEBS_96 = \
        $(DEB_PGSQL_COMMON_MODS) \
        postgresql-9.6 \
@@ -161,11 +165,13 @@ install_postgres_server:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 install_postgres_server_10:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 # note: if/when grunt-cli is available as a
 # package, use the packaged version instead.

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 6917396..545a1a5 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -106,6 +106,10 @@ export CPAN_MODULES_FORCE = \
        Business::Stripe \
        Class::DBI::Frozen::301
 
+export CPAN_MODULES_PGSQL = \
+       String::KeyboardDistance \
+       Text::Levenshtein::Damerau::XS
+
 PGSQL_SERVER_DEBS_96 = \
        $(DEB_PGSQL_COMMON_MODS) \
        postgresql-9.6 \
@@ -162,11 +166,13 @@ install_postgres_server:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 install_postgres_server_10:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 # note: if/when grunt-cli is available as a
 # package, use the packaged version instead.

diff --git a/Open-ILS/src/extras/install/Makefile.debian-stretch b/Open-ILS/src/extras/install/Makefile.debian-stretch
index 953eebf..93221e3 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-stretch
+++ b/Open-ILS/src/extras/install/Makefile.debian-stretch
@@ -105,6 +105,10 @@ export CPAN_MODULES_FORCE = \
        Business::Stripe \
        Class::DBI::Frozen::301
 
+export CPAN_MODULES_PGSQL = \
+       String::KeyboardDistance \
+       Text::Levenshtein::Damerau::XS
+
 PGSQL_SERVER_DEBS_96 = \
        $(DEB_PGSQL_COMMON_MODS) \
        postgresql-9.6 \
@@ -161,11 +165,13 @@ install_postgres_server:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 install_postgres_server_10:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
        make -f $(DIR)/Makefile.debian debian_postgresql_repo
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_10)"
+       make -f $(DIR)/Makefile.common install_cpan_pgsql
 
 # note: if/when grunt-cli is available as a
 # package, use the packaged version instead.

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
index aafbb33..a734286 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic
@@ -104,7 +104,9 @@ export CPAN_MODULES_FORCE = \
        Class::DBI::Frozen::301
 
 export CPAN_MODULES_PGSQL = \
-       MARC::File::XML
+       MARC::File::XML \
+       String::KeyboardDistance \
+       Text::Levenshtein::Damerau::XS
 
 PGSQL_APT_REPO_DEBS = \
         wget \