From: Josh Stompro <stomproj@larl.org>
Date: Thu, 30 Apr 2015 14:37:50 +0000 (-0500)
Subject: LP#1445182 Changed Debian Jessie dependency install to use packages for dbi dbd-pgsql.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ecd884132fad9cc57aca44f5fe20aadba8285a3f;p=working%2FEvergreen.git

LP#1445182 Changed Debian Jessie dependency install to use packages for dbi dbd-pgsql.

Signed-off-by: Josh Stompro <stomproj@larl.org>
---

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index f8d7dff8a8..797ae09a24 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-send-perl\
 	libemail-simple-perl\
 	libgd-graph3d-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 4c32b15d56..3494069cfc 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 <osname>
    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