From d5089b7b4065ed9cc51ffae441a22c99439a5da2 Mon Sep 17 00:00:00 2001 From: Josh Stompro Date: Thu, 30 Apr 2015 09:37:50 -0500 Subject: [PATCH] LP#1445182 Changed Debian Jessie dependency install to use packages for dbi dbd-pgsql. Signed-off-by: Josh Stompro Signed-off-by: Ben Shum Conflicts: Open-ILS/src/extras/install/Makefile.debian-jessie --- Open-ILS/src/extras/install/Makefile.debian-jessie | 5 +++-- docs/installation/server_installation.txt | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie index 862fde7a74..042acd9271 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-jessie +++ b/Open-ILS/src/extras/install/Makefile.debian-jessie @@ -32,6 +32,9 @@ export DEBS = \ libdatetime-set-perl\ libdatetime-timezone-perl\ libdbd-pg-perl\ + libdbd-pgsql\ + libdbi-dev\ + libdbi1\ libemail-simple-perl\ libgd-graph3d-perl\ liblocale-maketext-lexicon-perl\ @@ -126,10 +129,8 @@ PACKAGER_DEBS = \ all: make -f $(DIR)/Makefile.debian install_debs - make -f $(DIR)/Makefile.debian test_for_libdbi_pkg make -f $(DIR)/Makefile.common install_cpan make -f $(DIR)/Makefile.common install_cpan_force - make -f $(DIR)/Makefile.common install_libdbi make -f $(DIR)/Makefile.debian install_js_sm make -f $(DIR)/Makefile.debian debian_sys_config diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt index 2bba5a070f..d6a78d27fa 100644 --- a/docs/installation/server_installation.txt +++ b/docs/installation/server_installation.txt @@ -100,10 +100,10 @@ make -f Open-ILS/src/extras/Makefile.install issuing the following commands as the *root* Linux account: + [NOTE] -You should skip this step if installing on Ubuntu Precise or Trusty. The ubuntu -targets use libdbd-pgsql from packages. +You should skip this step if installing on Ubuntu Precise, Trusty or Debian Jessie. The ubuntu +and Debian Jessie targets use libdbd-pgsql from packages. + -.Debian +.Debian Wheezy [source, bash] ------------------------------------------------------------------------------ echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf -- 2.43.2