[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. dc70c30e85ef5c4184be26966b2f8e7a77d94ea1

[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, master has been updated
       via  dc70c30e85ef5c4184be26966b2f8e7a77d94ea1 (commit)
       via  4af0f8365f2db5cb7345a4ee72b5893e7c3c3883 (commit)
      from  cdda11af2f411a1fad7e2d571b94af80523fa2ba (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 dc70c30e85ef5c4184be26966b2f8e7a77d94ea1
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Apr 10 13:20:17 2014 -0400

    LP#1306019 move Business::Stripe to the 'force' list
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 6c76bd2..213608c 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -71,11 +71,11 @@ export DEB_APACHE_DISMODS = \
 
 export CPAN_MODULES = \
 	Business::OnlinePayment::PayPal \
-	Business::Stripe \
 	Template::Plugin::POSIX \
 	Safe
 
 export CPAN_MODULES_FORCE = \
+	Business::Stripe \
 	Class::DBI::Frozen::301
 
 PGSQL_SERVER_DEBS_93 = \

commit 4af0f8365f2db5cb7345a4ee72b5893e7c3c3883
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Apr 10 11:39:06 2014 -0400

    LP#1306019 Debian Jessie makefile.install target
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>
    
    Conflicts:
    	Open-ILS/src/extras/Makefile.install
    	docs/installation/server_installation.txt

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 3aabf24..bb46f6d 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -4,12 +4,14 @@
 #
 # Makefile to install prerequisites for OpenSRF and Evergreen
 #
-# Currently supports Debian (wheezy, squeeze), Ubuntu (12.04), Ubuntu (14.04) and
-# Fedora (16 and 17).
+# Currently supports Debian (jessie, wheezy, squeeze), Ubuntu (12.04), 
+# Ubuntu (14.04) and Fedora (16 and 17).
 #
 # Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
 #
 # usage:
+# 	make -f Makefile.install debian-jessie
+# 	- or -
 # 	make -f Makefile.install debian-wheezy
 # 	- or -
 # 	make -f Makefile.install debian-squeeze
@@ -63,6 +65,8 @@ DIR = $(dir $(lastword $(MAKEFILE_LIST)))/install
 
 all:
 	@echo "please specify an OS" && exit 0
+debian-jessie:
+	@make -f $(DIR)/Makefile.debian-jessie
 debian-wheezy:
 	@make -f $(DIR)/Makefile.debian-wheezy
 debian-squeeze: 
@@ -74,6 +78,8 @@ ubuntu-precise:
 fedora:
 	@make -f $(DIR)/Makefile.fedora
 
+postgres-server-debian-jessie:
+	@make -f $(DIR)/Makefile.debian-jessie install_postgres_server
 postgres-server-debian-wheezy:
 	@make -f $(DIR)/Makefile.debian-wheezy install_postgres_server
 postgres-server-debian-squeeze: 
diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
new file mode 100644
index 0000000..6c76bd2
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -0,0 +1,103 @@
+# install files for Debian Wheezy
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+
+export DEBS = \
+	apache2-prefork-dev\
+	aspell\
+	aspell-en\
+	libbusiness-creditcard-perl\
+	libbusiness-isbn-data-perl\
+	libbusiness-isbn-perl\
+	libbusiness-issn-perl\
+	libbusiness-onlinepayment-authorizenet-perl\
+	libbusiness-onlinepayment-perl\
+	libdatetime-format-builder-perl\
+	libdatetime-format-iso8601-perl\
+	libdatetime-format-mail-perl\
+	libdatetime-perl\
+	libdatetime-set-perl\
+	libdatetime-timezone-perl\
+	libdbd-pg-perl\
+	libemail-send-perl\
+	libemail-simple-perl\
+	libgd-graph3d-perl\
+	liblibrary-callnumber-lc-perl \
+	liblocale-maketext-lexicon-perl\
+	liblog-log4perl-perl\
+	libmarc-charset-perl \
+	libmarc-record-perl\
+	libmarc-xml-perl \
+	libncurses5-dev\
+	libnet-ip-perl\
+	libnet-ldap-perl \
+	libnet-server-perl\
+	libnet-ssh2-perl\
+	libnet-z3950-simple2zoom-perl\
+	libnet-z3950-simpleserver-perl\
+	libnet-z3950-zoom-perl \
+	libnspr4-dev\
+	libole-storage-lite-perl\
+	libparent-perl\
+	libpq5\
+	libpq-dev\
+	librose-uri-perl\
+	librpc-xml-perl\
+	libspreadsheet-writeexcel-perl\
+	libsru-perl\
+	libssh2-1-dev\
+	libtest-warn-perl\
+	libtest-output-perl\
+	libtext-aspell-perl\
+	libtext-csv-perl\
+	libuniversal-require-perl\
+	libunix-syslog-perl\
+	libuuid-tiny-perl\
+	libyaz-dev\
+	postgresql-client-9.3\
+	libsoap-lite-perl\
+	libbz2-dev\
+	yaz
+
+export DEB_APACHE_MODS = \
+    expires\
+    include\
+    proxy\
+    proxy_http\
+    rewrite
+
+export DEB_APACHE_DISMODS = \
+    deflate
+
+export CPAN_MODULES = \
+	Business::OnlinePayment::PayPal \
+	Business::Stripe \
+	Template::Plugin::POSIX \
+	Safe
+
+export CPAN_MODULES_FORCE = \
+	Class::DBI::Frozen::301
+
+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
+	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
+
+install_postgres_server:
+	make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_93)"
+
+clean:
+	make -f $(DIR)/Makefile.common clean
+	make -f $(DIR)/Makefile.debian clean
+
+# vim:noet:sw=4:ts=4:
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index f7c2fd8..01686f4 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -83,8 +83,8 @@ deb http://backports.debian.org/debian-backports squeeze-backports main contrib
    retrieve the new packages from the backports repository.
 4. Issue the following commands as the *root* Linux account to install
    prerequisites using the `Makefile.install` prerequisite installer,
-   substituting `debian-squeeze`, `debian-wheezy`, `fedora`, `ubuntu-precise`, or
-   `ubuntu-trusty` for <osname> below:
+   substituting `debian-jessie`, `debian-wheezy`, `debian-squeeze`, `fedora`, 
+   `ubuntu-trusty`, or `ubuntu-precise` for <osname> below:
 +
 [source, bash]
 ------------------------------------------------------------------------------

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

Summary of changes:
 Open-ILS/src/extras/Makefile.install               |   10 ++++++++--
 ...kefile.debian-wheezy => Makefile.debian-jessie} |   16 ++++++++--------
 docs/installation/server_installation.txt          |    4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)
 copy Open-ILS/src/extras/install/{Makefile.debian-wheezy => Makefile.debian-jessie} (89%)


hooks/post-receive
-- 
Evergreen ILS