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

[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  70669a7a6689ab9a5cfd3d2360e51941b7b16511 (commit)
      from  508a0af14474b1298aacc0f11323aa1d422fbb75 (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 70669a7a6689ab9a5cfd3d2360e51941b7b16511
Author: Ben Shum <bshum at biblio.org>
Date:   Fri Feb 22 00:46:17 2013 -0500

    LP1054322 - libparent-perl not needed for Ubuntu Precise
    
    The newer version of Perl 5.14 which comes with Ubuntu Precise already
    contains the contents of libparent-perl, which is now an obsolete package.
    
    Remove this dependency from the extra debs installed for Debian and Ubuntu
    but then add to the extras for Debian Squeeze and create a new extras just
    for Ubuntu Lucid so that it continues to be installed on those systems and
    not on Ubuntu Precise.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 3d0b00b..b6e1d8c 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -80,7 +80,6 @@ DEBS =  \
 	libnet-ssh2-perl\
 	libnspr4-dev\
 	libole-storage-lite-perl\
-	libparent-perl \
 	libspreadsheet-writeexcel-perl\
 	libssh2-1-dev\
 	libtext-aspell-perl\
@@ -101,8 +100,12 @@ EXTRA_DEBS = \
 	yaz
 
 EXTRA_DEBS_SQUEEZE = \
+    libparent-perl \
     libuuid-tiny-perl
 
+EXTRA_DEBS_LUCID = \
+    libparent-perl
+
 EXTRA_DEBS_PRECISE = \
     libdbi-dev \
     libdbd-pgsql \
@@ -275,7 +278,7 @@ generic_debian: install_debs install_yaz test_for_libdbi_pkg install debian_sys_
 
 # Needs for Ubuntu Lucid Lynx (10.04 LTS):
 ubuntu-lucid: lucid generic_ubuntu
-lucid: install_pgsql_client_debs_90 install_extra_debs \
+lucid: install_pgsql_client_debs_90 install_extra_debs_lucid \
        install_cpan_marc_record install_yaz install_cpan_more \
        install_cpan_safe install_cpan_lucid install test_for_libdbi_pkg \
        install_libdbi
@@ -462,6 +465,10 @@ install_pgsql_server_backport_debs_91:
 install_extra_debs_squeeze: install_extra_debs
 	$(APT_TOOL) install $(EXTRA_DEBS_SQUEEZE)
 
+# Install dependencies for Ubuntu 10.04:
+install_extra_debs_lucid: install_extra_debs
+	$(APT_TOOL) install $(EXTRA_DEBS_LUCID)
+
 # Install dependencies for Ubuntu 12.04:
 install_extra_debs_precise: install_extra_debs
 	$(APT_TOOL) install $(EXTRA_DEBS_PRECISE)

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

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


hooks/post-receive
-- 
Evergreen ILS