From: Ben Shum <bshum@biblio.org>
Date: Fri, 22 Feb 2013 05:46:17 +0000 (-0500)
Subject: LP1054322 - libparent-perl not needed for Ubuntu Precise
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9ec354a62cb6bfaeb9713edfcd8a721e4ca93ab3;p=evergreen%2Fpines.git

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@biblio.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index f8c042d191..043a8c6ff6 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 \
@@ -271,7 +274,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
@@ -458,6 +461,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)