From 585a721bce1fbb1bf6aa2d9da49a93172d29b34b Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Thu, 3 Apr 2014 12:54:45 -0400 Subject: [PATCH] LP#1315531 Continuing to add trusty support and remove lucid. Adding PostgreSQL 9.3 as the default database for 14.04. Signed-off-by: Chris Sharp Signed-off-by: Ben Shum --- Open-ILS/src/extras/Makefile.install | 8 ++++---- Open-ILS/src/extras/install/Makefile.ubuntu-trusty | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index 906ed3da6d..c5a90afdcb 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -67,8 +67,8 @@ debian-wheezy: @make -f $(DIR)/Makefile.debian-wheezy debian-squeeze: @make -f $(DIR)/Makefile.debian-squeeze -ubuntu-lucid: - @make -f $(DIR)/Makefile.ubuntu-lucid +ubuntu-trusty: + @make -f $(DIR)/Makefile.ubuntu-trusty ubuntu-precise: @make -f $(DIR)/Makefile.ubuntu-precise fedora: @@ -78,8 +78,8 @@ postgres-server-debian-wheezy: @make -f $(DIR)/Makefile.debian-wheezy install_postgres_server postgres-server-debian-squeeze: @make -f $(DIR)/Makefile.debian-squeeze install_postgres_server -postgres-server-ubuntu-lucid: - @make -f $(DIR)/Makefile.ubuntu-lucid install_postgres_server +postgres-server-ubuntu-trusty: + @make -f $(DIR)/Makefile.ubuntu-trusty install_postgres_server postgres-server-ubuntu-precise: @make -f $(DIR)/Makefile.ubuntu-precise install_postgres_server postgres-server-fedora: diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty index 418f3b88f7..375e35e616 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty @@ -55,7 +55,7 @@ export DEBS = \ libunix-syslog-perl\ libuuid-tiny-perl\ libyaz-dev\ - postgresql-client-9.1\ + postgresql-client-9.3\ libsoap-lite-perl\ libtest-warn-perl\ yaz @@ -80,11 +80,11 @@ export CPAN_MODULES = \ export CPAN_MODULES_FORCE = \ Class::DBI::Frozen::301 -PGSQL_SERVER_DEBS_91 = \ - postgresql-9.1 \ - postgresql-contrib-9.1 \ - postgresql-plperl-9.1 \ - postgresql-server-dev-9.1 +PGSQL_SERVER_DEBS_93 = \ + postgresql-9.3 \ + postgresql-contrib-9.3 \ + postgresql-plperl-9.3 \ + postgresql-server-dev-9.3 all: make -f $(DIR)/Makefile.debian install_debs @@ -95,7 +95,7 @@ all: make -f $(DIR)/Makefile.debian debian_sys_config install_postgres_server: - make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)" + make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_93)" clean: make -f $(DIR)/Makefile.common clean -- 2.43.2