Install PostgreSQL 9.4 on Ubuntu Trusty 14.04

Make PG 9.4 the default for Trusty too

Signed-off-by: Ben Shum <ben@evergreener.net>

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index 9549872..6a9b708 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -67,7 +67,7 @@ export DEBS = \
        libuniversal-require-perl\
        libunix-syslog-perl\
        libyaz-dev\
-       postgresql-client-9.3\
+       postgresql-client-9.4\
        libsoap-lite-perl\
        libtest-warn-perl\
        libparse-recdescent-perl\
@@ -95,12 +95,16 @@ export CPAN_MODULES_FORCE = \
        Business::Stripe \
        Class::DBI::Frozen::301
 
-PGSQL_SERVER_DEBS_93 = \
+PGSQL_APT_REPO_DEBS = \
+       wget \
+       ca-certificates
+
+PGSQL_SERVER_DEBS_94 = \
        $(DEB_PGSQL_COMMON_MODS) \
-       postgresql-9.3 \
-       postgresql-contrib-9.3 \
-       postgresql-plperl-9.3 \
-       postgresql-server-dev-9.3
+       postgresql-9.4 \
+       postgresql-contrib-9.4 \
+       postgresql-plperl-9.4 \
+       postgresql-server-dev-9.4
 
 # note: some prereqs are repeated in the developer/packager 
 # sections to support building Evergreen packages on servers
@@ -135,6 +139,8 @@ TRANSLATOR_DEBS = \
        bzr
 
 all:
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_APT_REPO_DEBS)"
+       make -f $(DIR)/Makefile.debian debian_postgresql_repo
        make -f $(DIR)/Makefile.debian install_debs
        make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
        make -f $(DIR)/Makefile.common install_cpan
@@ -142,7 +148,7 @@ all:
        make -f $(DIR)/Makefile.debian debian_sys_config
 
 install_postgres_server:
-       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_93)"
+       make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_94)"
 
 # note: if/when grunt-cli and bower are available as 
 # packages, use the packaged versions instead.