[OpenSRF-GIT] OpenSRF branch rel_2_1 updated. osrf_rel_2_1_0-3-gcd24bb1

[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, rel_2_1 has been updated
       via  cd24bb1c94c95027310f63909b692e4dbb05507f (commit)
       via  20a115a421c56b56968accc27b63da7656a70ee8 (commit)
      from  83dd58abfca26418f8bdaecb73dbd2c177cc0093 (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 cd24bb1c94c95027310f63909b692e4dbb05507f
Author: Dan Scott <dscott at laurentian.ca>
Date:   Mon Oct 22 11:50:21 2012 -0400

    Use apt-get instead of aptitude on Debian / Ubuntu
    
    Reports from the field state that aptitude is not installed by default on
    Ubuntu any longer; thus go with the sure thing.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/README b/README
index 668060d..6278b89 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@ using the Makefile.install prerequisite installer, substituting your
 operating system identifier for <osname> below:
 
 ---------------------------------------------------------------------------
-aptitude install make
+apt-get install make
 make -f src/extras/Makefile.install <osname>
 ---------------------------------------------------------------------------
 
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 734b343..50b3cc1 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -26,7 +26,7 @@ SHELL=/bin/bash
 # 64 or 32 bit os?
 LBITS=$(shell getconf LONG_BIT)
 
-APT_TOOL=aptitude -yq
+APT_TOOL=apt-get -yq
 
 # Debian dependencies
 DEBS =  \

commit 20a115a421c56b56968accc27b63da7656a70ee8
Author: Dan Scott <dscott at laurentian.ca>
Date:   Mon Oct 22 11:53:24 2012 -0400

    Remove the reference to Evergreen in the README
    
    Stephen Wills reported problems installing Evergreen because of missing
    dependencies, and reading the OpenSRF README shows that it refers to the
    Evergreen prerequisite installer in a confusing way that might lead to
    users using only the Evergreen Makefile.install, rather than using the
    OpenSRF Makefile.install.
    
    In addition, Fedora 16 is going to be out of support soon, and Fedora 17
    and 18 are well-tested targets now.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/README b/README
index e23cf37..668060d 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ Installing prerequisites
 OpenSRF has a number of prerequisite packages that must be installed
 before you can successfully configure, compile, and install OpenSRF.
 On Debian and Ubuntu, the easiest way to install these prerequisites
-is to use the Makefile.install prerequisite installer for Evergreen.
+is to use the Makefile.install prerequisite installer.
 
 Issue the following commands as the root user to install prerequisites
 using the Makefile.install prerequisite installer, substituting your
@@ -42,7 +42,7 @@ Well-tested values for <osname> include:
   * `debian-squeeze` for Debian 6.0
   * `ubuntu-lucid` for Ubuntu 10.04
   * `ubuntu-precise` for Ubuntu 12.04
-  * `fedora` for Fedora 16
+  * `fedora` for Fedora 17 and later
 
 Patches and suggestions for improvement from users of these distributions,
 or others, are welcome!

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

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


hooks/post-receive
-- 
OpenSRF