From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 9 Mar 2010 03:19:09 +0000 (+0000)
Subject: Backport r15662: add encoding support for Etch and Hardy, remove Gutsy
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=de7cbce58ef2b7b84ddc3a78bfe9cfdff90b130a;p=working%2FEvergreen.git

Backport r15662: add encoding support for Etch and Hardy, remove Gutsy


git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@15746 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index cb1667a753..4a7d9f17a8 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -3,7 +3,7 @@
 #
 # Makefile to install prerequisites for OpenSRF and Evergreen
 #
-# Currently supports Debian (etch/lenny), Ubuntu (gutsy/hardy/intrepid), and Gentoo.
+# Currently supports Debian (etch/lenny), Ubuntu (hardy/intrepid/karmic), and Gentoo.
 # Working towards support of CentOS 5 / RHEL 5.
 # Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
 #
@@ -12,8 +12,6 @@
 # 	- or -
 # 	make -f Makefile.install debian-lenny
 # 	- or -
-# 	make -f Makefile.install ubuntu-gutsy
-# 	- or -
 # 	make -f Makefile.install ubuntu-hardy
 # 	- or -
 # 	make -f Makefile.install ubuntu-intrepid
@@ -102,6 +100,13 @@ EXTRA_DEBS = \
 	libyaz-dev \
 	yaz
 
+# Ubuntu Hardy and Debian Etch require libencode-perl 
+# to get a version of Encode > 2.12 - see bug 525069.
+# Note that the Debian version of libencode-perl comes
+# from etch-backports.
+EXTRA_ENCODE = \
+	libencode-perl
+
 CENTOS = \
 	aspell \
 	aspell-devel \
@@ -224,7 +229,7 @@ centos: install_centos_pgsql install_centos_rpms install_yaz install_cpan_marc i
 
 debian-etch: etch generic_debian
 debian-lenny: lenny generic_debian
-etch: install_pgsql_client_debs_81 install_yaz install_cpan_marc
+etch: install_pgsql_client_debs_81 install_yaz install_cpan_marc install_extra_encode
 lenny: install_pgsql_client_debs_83 install_extra_debs
 generic_debian:  install_debs install debian_sys_config
 
@@ -232,10 +237,9 @@ gentoo: install_gentoos install_gentoo_perl install
 
 rhel: centos
 
-ubuntu-gutsy: hardy generic_ubuntu 
 ubuntu-hardy: hardy generic_ubuntu
 ubuntu-intrepid: intrepid generic_ubuntu
-hardy: install_pgsql_client_debs_82 install_yaz install_cpan_marc
+hardy: install_pgsql_client_debs_82 install_yaz install_cpan_marc install_extra_encode
 intrepid: install_pgsql_client_debs_83 install_extra_debs
 generic_ubuntu: install_debs install debian_sys_config
 
@@ -333,6 +337,10 @@ install_pgsql_server_debs_81:
 install_extra_debs:
 	$(APT_TOOL) install $(EXTRA_DEBS)
 
+# Install specific modules required by Ubuntu Hardy and
+# Debian Etch - see bug 525069
+install_extra_encode:
+	$(APT_TOOL) install $(EXTRA_ENCODE)
 
 # ------------------------------------------------------------------
 # - GENTOO ---------------------------------------------------------
diff --git a/README b/README
index 7d775cec78..0243787daf 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ installer.
 
 Issue the following commands as the root user to install prerequisites
 using the Makefile.install prerequisite installer, substituting
-"debian-etch", "debian-lenny", "ubuntu-gutsy", "ubuntu-hardy",
+"debian-etch", "debian-lenny", "ubuntu-hardy",
 "ubuntu-intrepid", "ubuntu-karmic", "centos", "rhel", or "gentoo"
 for <osname> below: