From a53e3878ae172477582ae3cfe3ebd8ec9be14e65 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 10 Apr 2014 12:05:08 -0400 Subject: [PATCH] LP#1306044 Debian Jessie Makefile.install target * Removes Perl Net::Jabber as a dependency. There is no Jessie package for this and OpenSRF hasn't used it in a long time. * Leaving Debian Squeeze in place for now Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton --- README | 1 + src/extras/Makefile.install | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/README b/README index 1e72f75..cbe0061 100644 --- a/README +++ b/README @@ -39,6 +39,7 @@ make -f src/extras/Makefile.install Well-tested values for include: + * `debian-jessie` for Debian 8.0 * `debian-wheezy` for Debian 7.0 * `debian-squeeze` for Debian 6.0 * `ubuntu-lucid` for Ubuntu 10.04 diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install index f717448..c5aa758 100644 --- a/src/extras/Makefile.install +++ b/src/extras/Makefile.install @@ -4,12 +4,14 @@ # # Makefile to install prerequisites for OpenSRF # -# Currently supports Debian (wheezy/squeeze), Ubuntu (lucid/precise) +# Currently supports Debian (jessie/wheezy/squeeze), Ubuntu (lucid/precise) # and Fedora (16). # # Installs Perl prereqs, libjs with Perl wrapper # # usage: +# make -f Makefile.install debian-jessie +# - or - # make -f Makefile.install debian-wheezy # - or - # make -f Makefile.install debian-squeeze @@ -56,7 +58,6 @@ DEBS = \ liblog-log4perl-perl\ libmodule-build-perl\ libnet-dns-perl\ - libnet-jabber-perl\ libperl-dev\ libreadline-dev\ libtemplate-perl\ @@ -123,7 +124,6 @@ FEDORAS = \ perl-Log-Log4perl \ perl-Module-Build \ perl-Net-DNS \ - perl-Net-Jabber \ perl-Net-Server \ perl-SQL-Abstract-Limit \ perl-Template-Toolkit \ @@ -166,6 +166,13 @@ EXTRA_DEBS_WHEEZY = \ libxml-libxslt-perl \ libncurses5-dev +EXTRA_DEBS_JESSIE = \ + libmemcached-dev \ + libmemcached-tools \ + libxml-libxml-perl \ + libxml-libxslt-perl \ + libncurses5-dev + EXTRA_DEBS_UBUNTU_LUCID = \ libmemcached-dev\ libxml-libxml-perl \ @@ -183,8 +190,10 @@ all: @echo "please specify an OS" && exit 0 +debian-jessie: generic_debian jessie debian-wheezy: generic_debian wheezy debian-squeeze: generic_debian squeeze +jessie: install_extra_debs_jessie wheezy: install_extra_debs_wheezy squeeze: install_extra_debs_squeeze generic_debian: install_debs debian_sys_config @@ -218,6 +227,9 @@ install_debs: install_extra_debs: $(APT_TOOL) install $(EXTRA_DEBS) +install_extra_debs_jessie: install_extra_debs + $(APT_TOOL) install $(EXTRA_DEBS_JESSIE) + install_extra_debs_wheezy: install_extra_debs $(APT_TOOL) install $(EXTRA_DEBS_WHEEZY) -- 2.43.2