[OpenSRF-GIT] OpenSRF branch master updated. 65ce998b02d0778541b3101379013448cba606d2

[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 "OpenSRF".

The branch, master has been updated
       via  65ce998b02d0778541b3101379013448cba606d2 (commit)
       via  be5c3d82ecba066b1f4b811af9a32a85eb1c6d70 (commit)
      from  339ac28d47a466d2fd0009c24fe0385cb5326479 (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 65ce998b02d0778541b3101379013448cba606d2
Author: Ben Shum <bshum at biblio.org>
Date:   Fri Apr 18 16:36:38 2014 -0400

    LP#1315525: Add trusty target and remove lucid from README
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/README b/README
index cbe0061..56fc678 100644
--- a/README
+++ b/README
@@ -42,8 +42,8 @@ Well-tested values for <osname> include:
   * `debian-jessie` for Debian 8.0
   * `debian-wheezy` for Debian 7.0
   * `debian-squeeze` for Debian 6.0
-  * `ubuntu-lucid` for Ubuntu 10.04
   * `ubuntu-precise` for Ubuntu 12.04
+  * `ubuntu-trusty` for Ubuntu 14.04
   * `fedora` for Fedora 17 and later
 
 Patches and suggestions for improvement from users of these distributions,

commit be5c3d82ecba066b1f4b811af9a32a85eb1c6d70
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Sun Jan 26 10:41:31 2014 -0500

    LP#1315525: Updating Makefile.install for Ubuntu 14.04. Removing lucid support.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index c5aa758..edcd61a 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -4,7 +4,7 @@
 #
 # Makefile to install prerequisites for OpenSRF
 #
-# Currently supports Debian (jessie/wheezy/squeeze), Ubuntu (lucid/precise)
+# Currently supports Debian (jessie/wheezy/squeeze), Ubuntu (precise/trusty)
 # and Fedora (16).
 #
 # Installs Perl prereqs, libjs with Perl wrapper
@@ -16,10 +16,10 @@
 # 	- or -
 # 	make -f Makefile.install debian-squeeze
 # 	- or -
-# 	make -f Makefile.install ubuntu-lucid
-# 	- or -
 # 	make -f Makefile.install ubuntu-precise
 # 	- or -
+# 	make -f Makefile.install ubuntu-trusty
+# 	- or -
 # 	make -f Makefile.install fedora
 #
 # ---------------------------------------------------------------------
@@ -173,12 +173,13 @@ EXTRA_DEBS_JESSIE = \
 	libxml-libxslt-perl \
 	libncurses5-dev
 
-EXTRA_DEBS_UBUNTU_LUCID = \
+EXTRA_DEBS_UBUNTU_PRECISE = \
 	libmemcached-dev\
 	libxml-libxml-perl \
-	libxml-libxslt-perl
+	libxml-libxslt-perl \
+	ncurses-dev
 
-EXTRA_DEBS_UBUNTU_PRECISE = \
+EXTRA_DEBS_UBUNTU_TRUSTY = \
 	libmemcached-dev\
 	libxml-libxml-perl \
 	libxml-libxslt-perl \
@@ -200,10 +201,10 @@ generic_debian: install_debs debian_sys_config
 
 fedora: install_fedora_rpms
 
-ubuntu-lucid: generic_ubuntu lucid
 ubuntu-precise: generic_ubuntu precise
-lucid: install_extra_debs install_extra_debs_lucid
+ubuntu-trusty: generic_ubuntu trusty
 precise: install_extra_debs install_extra_debs_precise
+trusty: install_extra_debs install_extra_debs_trusty
 generic_ubuntu: install_debs debian_sys_config
 
 # ------------------------------------------------------------------
@@ -237,12 +238,12 @@ install_extra_debs_squeeze: install_extra_debs
 	$(APT_TOOL) install $(EXTRA_DEBS_SQUEEZE)
 
 # Install even more packaged dependencies on modern distros
-install_extra_debs_lucid:
-	$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_LUCID)
-
 install_extra_debs_precise:
 	$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_PRECISE)
 
+install_extra_debs_trusty:
+	$(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_TRUSTY)
+
 # Fedora
 install_fedora_rpms:
 	yum -y install $(FEDORAS)

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

Summary of changes:
 README                      |    2 +-
 src/extras/Makefile.install |   23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
OpenSRF