From b096aa745958efd8181d4624e9db4d0870c8d134 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Thu, 13 Feb 2014 20:33:42 -0300 Subject: [PATCH] Revert "add the nokogiri gem as dependency" --- INSTALL.md | 3 +-- config/initializers/dependencies.rb | 1 - debian/control | 1 - script/install-dependencies/debian-squeeze.sh | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index a20b6c5..fa2153c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -23,7 +23,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or De # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \ libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \ libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \ - tango-icon-theme libnokogiri-ruby + tango-icon-theme On other systems, they may or may not be available through your regular package management system. Below are the links to their homepages. @@ -41,7 +41,6 @@ On other systems, they may or may not be available through your regular package * Thin: http://code.macournoyer.com/thin * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library * Hpricot: http://hpricot.com -* Nokogiri: http://nokogiri.org/ If you manage to install Noosfero successfully on other systems than Debian, please feel free to contact the Noosfero development mailing with the diff --git a/config/initializers/dependencies.rb b/config/initializers/dependencies.rb index cf78eda..65fa81a 100644 --- a/config/initializers/dependencies.rb +++ b/config/initializers/dependencies.rb @@ -8,4 +8,3 @@ require 'route_if' # third-party libraries require 'will_paginate' -require 'nokogiri' diff --git a/debian/control b/debian/control index 209cb42..17539b9 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,6 @@ Depends: thin, tango-icon-theme, libhpricot-ruby, - libnokogiri-ruby, memcached, debconf, dbconfig-common, diff --git a/script/install-dependencies/debian-squeeze.sh b/script/install-dependencies/debian-squeeze.sh index 07028ad..fd2b100 100644 --- a/script/install-dependencies/debian-squeeze.sh +++ b/script/install-dependencies/debian-squeeze.sh @@ -5,7 +5,7 @@ run sudo apt-get -y install $runtime_dependencies sudo apt-get -y install iceweasel || sudo apt-get -y install firefox # needed for development -run sudo apt-get -y install libtidy-ruby libhpricot-ruby libnokogiri-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre +run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre gem which bundler >/dev/null 2>&1 || gem_install bundler setup_rubygems_path run bundle install -- libgit2 0.21.2