[open-ils-commits] r15747 - in branches/rel_1_6_0: . Open-ILS/src/extras (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-03-08 22:19:44 -0500 (Mon, 08 Mar 2010)
New Revision: 15747

Modified:
   branches/rel_1_6_0/Open-ILS/src/extras/Makefile.install
   branches/rel_1_6_0/README
Log:
Backport r15662: add encoding support for Etch and Hardy, remove Gutsy


Modified: branches/rel_1_6_0/Open-ILS/src/extras/Makefile.install
===================================================================
--- branches/rel_1_6_0/Open-ILS/src/extras/Makefile.install	2010-03-09 03:19:09 UTC (rev 15746)
+++ branches/rel_1_6_0/Open-ILS/src/extras/Makefile.install	2010-03-09 03:19:44 UTC (rev 15747)
@@ -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 @@
 	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 @@
 
 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 @@
 
 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_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 ---------------------------------------------------------

Modified: branches/rel_1_6_0/README
===================================================================
--- branches/rel_1_6_0/README	2010-03-09 03:19:09 UTC (rev 15746)
+++ branches/rel_1_6_0/README	2010-03-09 03:19:44 UTC (rev 15747)
@@ -15,7 +15,7 @@
 
 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: