[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 7366f5a1d9eb1b46fa11aecd0ff82edd4bee45a6

[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, rel_2_0 has been updated
       via  7366f5a1d9eb1b46fa11aecd0ff82edd4bee45a6 (commit)
      from  e2db91d200520ffcb561c0e0aad22c0491b7628c (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 7366f5a1d9eb1b46fa11aecd0ff82edd4bee45a6
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon May 23 10:16:16 2011 -0400

    Update Lenny prereqs for MARC::Record 2.0.1+
    
    2.0 requires MARC::Record 2.0.1+, and the packaged version of
    MARC::Record is just 2.0.0. This causes mysterious failures of
    various open-ils.search.biblio.* methods - so teach the prereq
    installer to get a new enough version of MARC::Record on Lenny.
    
    Aside: The juggling of prereqs in a single Makefile for multiple distros
    is starting to get extremely complex, perhaps it's time to split them
    out to a single Makefile per distro?
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 1bfb957..0f2a580 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -89,7 +89,6 @@ DEBS =  \
 	libemail-send-perl\
 	libgd-graph3d-perl\
 	liblog-log4perl-perl\
-	libmarc-record-perl\
 	libncurses5-dev\
 	libnet-server-perl\
 	libnet-ssh2-perl\
@@ -110,13 +109,15 @@ EXTRA_DEBS = \
 	libbusiness-isbn-perl\
 	libbusiness-isbn-data-perl\
 	libmarc-charset-perl \
-	libmarc-xml-perl \
 	libnet-z3950-zoom-perl \
 	libyaz-dev \
 	yaz
 
+# Squeeze has MARC::File::XML and a new enough version of MARC::Record (2.0.2)
 EXTRA_DEBS_SQUEEZE = \
-    libuuid-tiny-perl
+	libmarc-record-perl\
+	libmarc-xml-perl\
+	libuuid-tiny-perl
 
 # Ubuntu Hardy requires libencode-perl # to get a version of Encode
 # > 2.12 - see bug 525069.
@@ -236,7 +237,6 @@ CPAN_MODULES = \
 # More chronically unpackaged CPAN modules (available in Squeeze though)
 CPAN_MODULES_MORE = \
     Business::CreditCard::Object \
-    MARC::Record \
     Net::SSH2 \
     UUID::Tiny
 
@@ -248,9 +248,10 @@ CPAN_MODULES_SAFE = \
 CPAN_MODULES_MARC = \
 	Business::ISBN \
 	Business::ISBN::Data \
-    MARC::Charset \
-    MARC::File::XML \
-    Net::Z3950::ZOOM
+	MARC::Charset \
+	MARC::Record \
+	MARC::File::XML \
+	Net::Z3950::ZOOM
 
 CPAN_MODULES_FORCE = \
 	Class::DBI::Frozen::301
@@ -270,7 +271,7 @@ centos_like: install_centos_rpms install_yaz install_cpan_marc install install_c
 fedora13: install_fedora_13_rpms install_cpan install_cpan_fedora install_cpan_marc install_js_sm install_cpan_force
 fedora14: fedora13
 
-debian-lenny: lenny generic_debian install_cpan_more install_cpan_safe
+debian-lenny: lenny generic_debian install_cpan_marc install_cpan_more install_cpan_safe
 debian-squeeze: squeeze generic_debian
 lenny: install_pgsql_client_debs_83 install_extra_debs
 squeeze: install_pgsql_client_debs_84  install_extra_debs_squeeze

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

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


hooks/post-receive
-- 
Evergreen ILS