[open-ils-commits] [GIT] Evergreen ILS branch rel_2_8 updated. 724b97de25ec216798a908899d3fe4bf6d71a06e

Evergreen Git git at git.evergreen-ils.org
Fri Apr 22 22:16:32 EDT 2016


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_8 has been updated
       via  724b97de25ec216798a908899d3fe4bf6d71a06e (commit)
      from  a408daf740cbe904bbe2bd5647381af7ca78a0f5 (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 724b97de25ec216798a908899d3fe4bf6d71a06e
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Mar 18 10:34:40 2016 -0400

    LP#1559121: remove Debian Squeeze support
    
    Now that Debian Squeeze's LTS (long-term support) period
    has ended, Evergreen no longer offers community support
    for that distribution. This patch removes references
    to Squeeze from the installation scripts and documentation.
    
    To test:
    
    [1] Verify that Debian Squeeze is no longer referenced in
        the installation documentation.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>
    
    Conflicts:
    	docs/installation/server_upgrade.txt

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 54c5460..f583087 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -4,7 +4,7 @@
 #
 # Makefile to install prerequisites for OpenSRF and Evergreen
 #
-# Currently supports Debian (jessie, wheezy, squeeze), Ubuntu (12.04), 
+# Currently supports Debian (jessie, wheezy), Ubuntu (12.04), 
 # Ubuntu (14.04) and Fedora (16 and 17).
 #
 # Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
@@ -14,8 +14,6 @@
 # 	- or -
 # 	make -f Makefile.install debian-wheezy
 # 	- or -
-# 	make -f Makefile.install debian-squeeze
-# 	- or -
 # 	make -f Makefile.install ubuntu-precise
 # 	- or -
 # 	make -f Makefile.install ubuntu-trusty
@@ -73,8 +71,6 @@ debian-jessie:
 	@make -f $(DIR)/Makefile.debian-jessie
 debian-wheezy:
 	@make -f $(DIR)/Makefile.debian-wheezy
-debian-squeeze: 
-	@make -f $(DIR)/Makefile.debian-squeeze
 ubuntu-trusty:
 	@make -f $(DIR)/Makefile.ubuntu-trusty
 ubuntu-precise:
@@ -86,8 +82,6 @@ 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: 
-	@make -f $(DIR)/Makefile.debian-squeeze install_postgres_server
 postgres-server-ubuntu-trusty:
 	@make -f $(DIR)/Makefile.ubuntu-trusty install_postgres_server
 postgres-server-ubuntu-precise:
diff --git a/Open-ILS/src/extras/install/Makefile.debian-squeeze b/Open-ILS/src/extras/install/Makefile.debian-squeeze
deleted file mode 100644
index fdefa6b..0000000
--- a/Open-ILS/src/extras/install/Makefile.debian-squeeze
+++ /dev/null
@@ -1,134 +0,0 @@
-# install files for Debian Squeeze
-
-DIR = $(dir $(lastword $(MAKEFILE_LIST)))
-APT_BACKPORT_TOOL = aptitude -t squeeze-backports -yq
-APT_SAFE_TOOL = aptitude -P
-APT_TOOL=aptitude -yq
-YAZ=yaz-4.2.32
-YAZ_HOST=http://ftp.indexdata.dk/pub/yaz
-
-
-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-payflowpro-perl\
-	libbusiness-onlinepayment-perl\
-	libdate-manip-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\
-	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-zoom-perl \
-	libnspr4-dev\
-	libole-storage-lite-perl\
-	libparent-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\
-	libsoap-lite-perl\
-	libbz2-dev\
-	libparse-recdescent-perl\
-	yaz
-
-export DEB_APACHE_MODS = \
-    expires\
-    include\
-    proxy\
-    proxy_http\
-    rewrite
-
-export DEB_APACHE_DISMODS = \
-    deflate
-
-export CPAN_MODULES = \
-	Excel::Writer::XLSX \
-	Business::OnlinePayment::PayPal \
-	Library::CallNumber::LC \
-	Net::Z3950::Simple2ZOOM \
-	RPC::XML \
-	Template::Plugin::POSIX \
-	SRU \
-	Rose::URI \
-	Safe
-
-export CPAN_MODULES_FORCE = \
-	Business::Stripe \
-	Class::DBI::Frozen::301
-
-PGSQL_SERVER_DEBS_91 = \
-	postgresql-9.1 \
-	postgresql-contrib-9.1 \
-	postgresql-plperl-9.1 \
-	postgresql-server-dev-9.1
-
-PGSQL_CLIENT_DEBS_91 = \
-	libpq5 \
-	libpq-dev \
-	postgresql-client-9.1
-
-
-all: install_pgsql_client_backport_debs_91 install_yaz
-	make -f $(DIR)/Makefile.debian install_debs
-	make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
-	make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
-	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_yaz:
-	if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi;
-	tar xzf $(YAZ).tar.gz
-	cd $(YAZ) && ./configure && make && make install && ldconfig
-
-install_postgres_server:
-	$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91)
-
-install_pgsql_client_backport_debs_91:
-	@if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \
-		then \
-		echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \
-		"of apache2-prefork-dev), but these are the 8.4 versions and they" \
-		"conflict with the 9.1 versions - so remove them, install the pinned" \
-		"backports of 9.1, then reinstall the apache2-prefork-dev package.\n\n" \
-		"**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \
-		"databases that might currently exist on this machine." && \
-		$(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \
-	fi
-	$(APT_BACKPORT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
-	$(APT_TOOL) install apache2-prefork-dev
-
-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 d6a78d2..7bd7a53 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -57,7 +57,7 @@ Installing prerequisites
   * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
     is 9.1.
   * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0), 
-    Debian Wheezy (7.0), Debian Squeeze(6.0), Ubuntu Trusty Tahr (14.04), 
+    Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04), 
     Ubuntu Precise Pangolin (12.04), and Fedora. 
     If you are running an older version of these distributions, you may want 
     to upgrade before upgrading Evergreen. For instructions on upgrading these
@@ -70,25 +70,18 @@ before you can successfully configure, compile, and install Evergreen.
 
 1. Begin by installing the most recent version of OpenSRF (2.4.0 or later).
    You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
-2. On many distributions, it is necessary to install PostgreSQL 9.1+ from external
+2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
    repositories.
 +
-  * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the
-    *root* Linux account and add the following line:
-+
-[source, bash]
-------------------------------------------------------------------------------
-deb http://backports.debian.org/debian-backports squeeze-backports main contrib
-------------------------------------------------------------------------------
-+
-  * Ubuntu Precise and Trusty comes with PostgreSQL 9.1+, so no additional steps are required.
+  * Debian Wheezy and Jessie Ubuntu Precise and Trusty comes with
+    PostgreSQL 9.1+, so no additional steps are required.
   * Fedora 19 and 20 come with PostgreSQL 9.2+, so no additional steps are required.
 +
 3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to
    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-jessie`, `debian-wheezy`, `debian-squeeze`, `fedora`, 
+   substituting `debian-jessie`, `debian-wheezy`, `fedora`, 
    `ubuntu-trusty`, or `ubuntu-precise` for <osname> below:
 +
 [source, bash]
@@ -400,7 +393,6 @@ command below based on your operating system.
 ------------------------------------------------------------------------------
 make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
 make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
-make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-squeeze
 make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
 make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
 make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 804c80b..10a78c0 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -9,7 +9,7 @@ Software Prerequisites
  * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
     is 9.1.
   * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0),
-    Debian Wheezy (7.0), Debian Squeeze(6.0), Ubuntu Trusty Tahr (14.04),
+    Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04),
     Ubuntu Precise Pangolin (12.04), and Fedora.
     If you are running an older version of these distributions, you may want
     to upgrade before upgrading Evergreen. For instructions on upgrading these
@@ -70,7 +70,6 @@ indexterm:[Linux, Ubuntu]
 +
   * `debian-jessie` for Debian Jessie (8.0) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
   * `debian-wheezy` for Debian Wheezy (7.0)
-  * `debian-squeeze` for Debian Squeeze (6.0)
   * `ubuntu-trusty` for Ubuntu Trusty Tahr (14.04) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
   * `ubuntu-precise` for Ubuntu Precise Pangolin (12.04)
   * `fedora` for Fedora

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

Summary of changes:
 Open-ILS/src/extras/Makefile.install               |    8 +-
 .../src/extras/install/Makefile.debian-squeeze     |  134 --------------------
 docs/installation/server_installation.txt          |   18 +--
 docs/installation/server_upgrade.txt               |    3 +-
 4 files changed, 7 insertions(+), 156 deletions(-)
 delete mode 100644 Open-ILS/src/extras/install/Makefile.debian-squeeze


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list