[open-ils-commits] [GIT] Evergreen ILS branch master updated. def53e4743953d0ad50f24f52145d8db5da85b58

Evergreen Git git at git.evergreen-ils.org
Fri Dec 9 15:48:44 EST 2011 

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  def53e4743953d0ad50f24f52145d8db5da85b58 (commit)
       via  02d253017e563241b32227fbc712050f49eb71ce (commit)
       via  611d70b069a760378aed841f9db8238916f98c60 (commit)
      from  6ebb789434cb554ce1036d92a4dded3ecf23b989 (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 def53e4743953d0ad50f24f52145d8db5da85b58
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Fri Dec 9 14:02:31 2011 -0500

    Fix typo in comment in Open-ILS/src/extras/Makefile.install.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 42a16a1..2afc773 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -328,7 +328,7 @@ lucid: install_pgsql_client_debs_90 install_extra_debs \
        install_cpan_safe install_cpan_lucid install test_for_libdbi_pkg \
        install_libdbi
 
-# Needs for Ubuntu Precise Panglin (12.04 LTS):
+# Needs for Ubuntu Precise Pangolin (12.04 LTS):
 ubuntu-precise: precise generic_ubuntu
 precise: install_pgsql_client_debs_91 install_extra_debs_precise \
 	 install_cpan_precise install_js_sm install_cpan_force

commit 02d253017e563241b32227fbc712050f49eb71ce
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Thu Dec 8 15:53:16 2011 -0500

    Update the README for Ubuntu Precise Pangolin (12.04).
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/README b/README
index bc32c27..e476035 100644
--- a/README
+++ b/README
@@ -99,14 +99,16 @@ apt-get install python-software-properties
 add-apt-repository ppa:pitti/postgresql
 ------------------------------------------------------------------------------
 +
+  * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required.
++
   * Fedora 16 comes with PostgreSQL 9, 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-squeeze`, `fedora16`, `ubuntu-lucid`, `centos`, or
-   `rhel` for <osname> below:
+   substituting `debian-squeeze`, `fedora16`, `ubuntu-lucid`, `ubuntu-precise`,
+   `centos`, or `rhel` for <osname> below:
 +
 [source, bash]
 ------------------------------------------------------------------------------
@@ -121,7 +123,11 @@ welcome!
 5. Add the libdbi-libdbd libraries to the system dynamic library path by
    issuing the following commands as the *root* Linux account:
 +
-.Debian / Ubuntu
+[NOTE]
+You should skip this step if installing on Ubuntu 12.04 LTS (Precise
+Pangolin).  The ubuntu-precise target uses libdbd-pgsql from packages.
++
+.Debian / Ubuntu Lucid
 [source, bash]
 ------------------------------------------------------------------------------
 echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf

commit 611d70b069a760378aed841f9db8238916f98c60
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Thu Dec 8 12:10:20 2011 -0500

    Update Open-ILS/src/extras/Makefile.install for Ubuntu 12.04.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 30a993a..42a16a1 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -122,6 +122,16 @@ EXTRA_DEBS = \
 EXTRA_DEBS_SQUEEZE = \
     libuuid-tiny-perl
 
+EXTRA_DEBS_PRECISE = \
+    libdbi-dev \
+    libdbd-pgsql \
+    libmarc-record-perl \
+    libbusiness-edi-perl \
+    liblibrary-callnumber-lc-perl \
+    libsru-perl \
+    libnet-z3950-simple2zoom-perl \
+    libuuid-tiny-perl
+
 # Ubuntu Hardy requires libencode-perl # to get a version of Encode
 # > 2.12 - see bug 525069.
 EXTRA_ENCODE = \
@@ -222,6 +232,11 @@ PGSQL_CLIENT_DEBS_90 = \
 	libpq-dev \
 	postgresql-client-9.0
 
+PGSQL_CLIENT_DEBS_91 = \
+	libpq5 \
+	libpq-dev \
+	postgresql-client-9.1
+
 PGSQL_SERVER_DEBS_90 = \
 	postgresql-9.0 \
 	postgresql-contrib-9.0 \
@@ -277,9 +292,16 @@ CPAN_MODULES_MARC_RECORD = \
 CPAN_MODULES_FORCE = \
 	Class::DBI::Frozen::301
 
-# Lucid needs this because the XML::RPC that comes by default is broken with Evergreen
-LUCID_CPAN = \
-	XML::RPC
+# Lucid Lynx needs the following additional CPAN modules.
+CPAN_MODULES_LUCID = \
+    RPC::XML::Function
+
+# Precise Pangolin needs the following CPAN modules. All others are
+# avaialalbe as debs.
+CPAN_MODULES_PRECISE = \
+    Business::CreditCard::Object \
+    Template::Plugin::POSIX \
+    RPC::XML::Function
 
 # ----------------------------------------------------------------------------
 
@@ -299,9 +321,22 @@ debian-squeeze: squeeze generic_debian
 squeeze: install_pgsql_client_debs_90  install_extra_debs_squeeze
 generic_debian: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_libdbi
 
+# Needs for Ubuntu Lucid Lynx (10.04 LTS):
 ubuntu-lucid: lucid generic_ubuntu
-lucid: install_pgsql_client_debs_90 install_extra_debs install_cpan_marc_record install_yaz install_cpan_lucid
-generic_ubuntu: install_debs install_yaz test_for_libdbi_pkg install debian_sys_config install_cpan_more install_cpan_safe install_libdbi
+lucid: install_pgsql_client_debs_90 install_extra_debs \
+       install_cpan_marc_record install_yaz install_cpan_more \
+       install_cpan_safe install_cpan_lucid install test_for_libdbi_pkg \
+       install_libdbi
+
+# Needs for Ubuntu Precise Panglin (12.04 LTS):
+ubuntu-precise: precise generic_ubuntu
+precise: install_pgsql_client_debs_91 install_extra_debs_precise \
+	 install_cpan_precise install_js_sm install_cpan_force
+
+# We don't do the "install" target on generic_ubuntu because newer
+# Ubuntu releases, like newer Debian releases, include packages for
+# many of those prerequisites.
+generic_ubuntu: install_debs debian_sys_config
 
 # - COMMON TARGETS ---------------------------------------------------------
 
@@ -337,7 +372,11 @@ install_cpan_fedora:
 
 # Install the CPAN modules needed for Lucid
 install_cpan_lucid:
-	for m in $(LUCID_CPAN); do perl -MCPAN -e "install \"$$m\";"; done
+	for m in $(CPAN_MODULES_LUCID); do perl -MCPAN -e "install \"$$m\";"; done
+
+# Install the CPAN modules needed for Precise
+install_cpan_precise:
+	for m in $(CPAN_MODULES_PRECISE); do perl -MCPAN -e "install \"$$m\";"; done
 
 # Install a known working version of YAZ
 install_yaz:    
@@ -444,6 +483,9 @@ install_pgsql_client_debs_90:
 install_pgsql_server_debs_90:
 	$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_90)
 
+install_pgsql_client_debs_91:
+	$(APT_TOOL) install $(PGSQL_CLIENT_DEBS_91)
+
 install_pgsql_server_debs_91:
 	$(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91)
 
@@ -451,6 +493,10 @@ install_pgsql_server_debs_91:
 install_extra_debs_squeeze: install_extra_debs
 	$(APT_TOOL) install $(EXTRA_DEBS_SQUEEZE)
 
+# Install dependencies for Ubuntu 12.04:
+install_extra_debs_precise: install_extra_debs
+	$(APT_TOOL) install $(EXTRA_DEBS_PRECISE)
+
 install_extra_debs:
 	$(APT_TOOL) install $(EXTRA_DEBS)
 

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

Summary of changes:
 Open-ILS/src/extras/Makefile.install |   58 ++++++++++++++++++++++++++++++---
 README                               |   12 +++++--
 2 files changed, 61 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Evergreen ILS

More information about the open-ils-commits mailing list