[open-ils-commits] [GIT] Evergreen ILS branch rel_2_7 updated. 330459eb1ccc41e4901535749ed392e5fcafbcea

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_7 has been updated
       via  330459eb1ccc41e4901535749ed392e5fcafbcea (commit)
      from  aaaad5b7138b872799b7cb417472c79a52109e08 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 330459eb1ccc41e4901535749ed392e5fcafbcea
Author: Josh Stompro <stomproj at larl.org>
Date:   Thu Apr 30 09:37:50 2015 -0500

    LP#1445182 Changed Debian Jessie dependency install to use packages for dbi dbd-pgsql.
    
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>
    
    Conflicts:
    	Open-ILS/src/extras/install/Makefile.debian-jessie

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 3be2c09..2793474 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\
@@ -96,10 +99,8 @@ PGSQL_SERVER_DEBS_94 = \
 
 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 4a0fd50..c90b61b 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -106,10 +106,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

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/install/Makefile.debian-jessie |    5 +++--
 docs/installation/server_installation.txt          |    6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS