From fcfff08a541b4ed2ed244ea4cb10d53f42128a3b Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Thu, 10 Jul 2014 14:25:18 -0400 Subject: [PATCH] LP#1315531 Remove remaining references to Lucid from README and Makefile There were still a few references to Ubuntu Lucid in README and makefile comments area. Also, the Makefile itself for Lucid was still there. Remove these last traces forever! Signed-off-by: Ben Shum --- Open-ILS/src/extras/Makefile.install | 6 +- .../src/extras/install/Makefile.ubuntu-lucid | 127 ------------------ docs/installation/server_installation.txt | 21 +-- 3 files changed, 7 insertions(+), 147 deletions(-) delete mode 100644 Open-ILS/src/extras/install/Makefile.ubuntu-lucid diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index c5a90afdcb..3aabf24c75 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -4,7 +4,7 @@ # # Makefile to install prerequisites for OpenSRF and Evergreen # -# Currently supports Debian (wheezy, squeeze), Ubuntu (10.04), Ubuntu (12.04) and +# Currently supports Debian (wheezy, squeeze), Ubuntu (12.04), Ubuntu (14.04) and # Fedora (16 and 17). # # Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz @@ -14,10 +14,10 @@ # - or - # make -f Makefile.install debian-squeeze # - or - -# make -f Makefile.install ubuntu-lucid -# - or - # make -f Makefile.install ubuntu-precise # - or - +# make -f Makefile.install ubuntu-trusty +# - or - # make -f Makefile.install fedora # # --------------------------------------------------------------------- diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid deleted file mode 100644 index 3f88c1944b..0000000000 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid +++ /dev/null @@ -1,127 +0,0 @@ -# install files for Ubuntu 10.04 LTS Lucid Lynx - -DIR = $(dir $(lastword $(MAKEFILE_LIST))) -APT_SAFE_TOOL = aptitude -P - -# We need a recent version of Yaz -# Ubuntu 10.04 comes with 3.0.52 -YAZ=yaz-4.2.32 -YAZ_HOST=http://ftp.indexdata.dk/pub/yaz - -export DEBS = \ - apache2-prefork-dev\ - aspell\ - aspell-en\ - libbusiness-creditcard-perl\ - libbusiness-isbn-data-perl\ - libbusiness-isbn-perl\ - libbusiness-onlinepayment-authorizenet-perl\ - libbusiness-onlinepayment-perl\ - libdatetime-format-builder-perl\ - libdatetime-format-iso8601-perl\ - libdatetime-format-mail-perl\ - libdatetime-perl\ - libdatetime-set-perl\ - libdatetime-timezone-perl\ - libdbd-pg-perl\ - libemail-send-perl\ - libemail-simple-perl\ - libgd-graph3d-perl\ - liblocale-maketext-lexicon-perl\ - liblog-log4perl-perl\ - libmarc-charset-perl \ - libmarc-xml-perl \ - libncurses5-dev\ - libnet-ip-perl\ - libnet-ldap-perl \ - libnet-server-perl\ - libnet-ssh2-perl\ - libnet-z3950-zoom-perl \ - libnspr4-dev\ - libole-storage-lite-perl\ - libparent-perl\ - libspreadsheet-writeexcel-perl\ - libssh2-1-dev\ - libtext-aspell-perl\ - libtext-csv-perl\ - libuniversal-require-perl\ - libunix-syslog-perl\ - libuuid-tiny-perl\ - libbz2-dev\ - libtest-warn-perl\ - libtest-output-perl\ - libsoap-lite-perl - -export DEB_APACHE_MODS = \ - expires\ - include\ - proxy\ - proxy_http\ - rewrite - -export DEB_APACHE_DISMODS = \ - deflate - -export CPAN_MODULES = \ - Business::ISSN \ - Business::OnlinePayment::PayPal \ - Library::CallNumber::LC \ - MARC::Record \ - Net::Z3950::Simple2ZOOM \ - RPC::XML \ - Template::Plugin::POSIX \ - SRU \ - Rose::URI \ - Safe - -export CPAN_MODULES_FORCE = \ - Business::Stripe \ - Class::DBI::Frozen::301 - -PGSQL_SERVER_DEBS_91 = \ - postgresql-9.1 \ - postgresql-contrib-9.1 \ - postgresql-plperl-9.1 \ - postgresql-server-dev-9.1 - -PGSQL_CLIENT_DEBS_91 = \ - libpq5 \ - libpq-dev \ - postgresql-client-9.1 - -all: install_yaz - make -f $(DIR)/Makefile.debian install_debs - make -f $(DIR)/Makefile.debian test_for_libdbi_pkg - make -f $(DIR)/Makefile.common install_net_z3950_simpleserver - make -f $(DIR)/Makefile.common install_cpan - make -f $(DIR)/Makefile.common install_cpan_force - make -f $(DIR)/Makefile.debian install_js_sm - make -f $(DIR)/Makefile.debian debian_sys_config - -install_yaz: - if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi; - tar xzf $(YAZ).tar.gz - cd $(YAZ) && ./configure && make && make install && ldconfig - -install_pgsql_server_debs_91: - $(APT_TOOL) install $(PGSQL_SERVER_DEBS_91) - -install_pgsql_client_backport_debs_91: - @if [ `$(APT_TOOL) versions libpq5 | grep ^i|sed 's/^i[ \t]*//'|cut -d. -f1` -eq 8 ]; \ - then \ - echo -e "libpq5 / libpq-dev are installed as part of OpenSRF (a dependency" \ - "of apache2-prefork-dev), but these are the 8.4 versions and they" \ - "conflict with the 9.1 versions - so remove them, install the pinned" \ - "backports of 9.1, then reinstall the apache2-prefork-dev package.\n\n" \ - "**WARNING**: Saying 'Yes' to this step will _remove_ any PostgreSQL" \ - "databases that might currently exist on this machine." && \ - $(APT_SAFE_TOOL) remove libpq5 libpq-dev ; \ - fi - $(APT_TOOL) install $(PGSQL_CLIENT_DEBS_91) - $(APT_TOOL) install apache2-prefork-dev - -clean: - make -f $(DIR)/Makefile.common clean - make -f $(DIR)/Makefile.debian clean - -# vim:noet:sw=4:ts=4: diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt index d0f8b8222f..f7c2fd8321 100644 --- a/docs/installation/server_installation.txt +++ b/docs/installation/server_installation.txt @@ -76,28 +76,15 @@ before you can successfully configure, compile, and install Evergreen. deb http://backports.debian.org/debian-backports squeeze-backports main contrib ------------------------------------------------------------------------------ + - * On Ubuntu Lucid, you can use a PPA (personal package archive), which are - package sources hosted on Launchpad. The one most commonly used by Evergreen - Community members is maintained by Martin Pitt, who also maintains the - official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue - the following commands to add the PPA source: -+ -[source, bash] ------------------------------------------------------------------------------- -apt-get install python-software-properties -add-apt-repository ppa:pitti/postgresql ------------------------------------------------------------------------------- -+ - * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required. -+ + * Ubuntu Precise and Trusty comes with PostgreSQL 9+, so no additional steps are required. * Fedora comes with PostgreSQL 9, so no additional steps are required. + 3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to retrieve the new packages from the backports repository. 4. Issue the following commands as the *root* Linux account to install prerequisites using the `Makefile.install` prerequisite installer, - substituting `debian-squeeze`, `debian-wheezy`, `fedora`, `ubuntu-lucid`, or - `ubuntu-precise` for below: + substituting `debian-squeeze`, `debian-wheezy`, `fedora`, `ubuntu-precise`, or + `ubuntu-trusty` for below: + [source, bash] ------------------------------------------------------------------------------ @@ -367,7 +354,7 @@ For production use, most libraries install the PostgreSQL database server on a dedicated machine. Therefore, by default, the `Makefile.install` prerequisite installer does *not* install the PostgreSQL 9 database server that is required by every Evergreen system. You can install the packages required by Debian or -Ubuntu Lucid on the machine of your choice using the following commands as the +Ubuntu on the machine of your choice using the following commands as the *root* Linux account: .(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages -- 2.43.2