Commit 141e3e6f95514c9343bfea1c87279fc8eeacc67d
1 parent
12d04695
Exists in
master
and in
29 other branches
New dependencies
Showing
3 changed files
with
17 additions
and
5 deletions
Show diff stats
Gemfile
| @@ -30,8 +30,8 @@ group :production do | @@ -30,8 +30,8 @@ group :production do | ||
| 30 | end | 30 | end |
| 31 | 31 | ||
| 32 | group :test do | 32 | group :test do |
| 33 | - gem 'rspec', '~> 2.10.0' | ||
| 34 | - gem 'rspec-rails', '~> 2.10.1' | 33 | + gem 'rspec', '~> 2.14.0' |
| 34 | + gem 'rspec-rails', '~> 2.14.1' | ||
| 35 | gem 'mocha', '~> 1.1.0', :require => false | 35 | gem 'mocha', '~> 1.1.0', :require => false |
| 36 | end | 36 | end |
| 37 | 37 |
debian/control
| @@ -14,8 +14,8 @@ Build-Depends: cucumber, | @@ -14,8 +14,8 @@ Build-Depends: cucumber, | ||
| 14 | ruby-database-cleaner, | 14 | ruby-database-cleaner, |
| 15 | ruby-gettext, | 15 | ruby-gettext, |
| 16 | ruby-mocha, | 16 | ruby-mocha, |
| 17 | - ruby-rspec, | ||
| 18 | - ruby-rspec-rails, | 17 | + ruby-rspec (>= 2.14), |
| 18 | + ruby-rspec-rails (>= 2.14), | ||
| 19 | ruby-selenium-webdriver, | 19 | ruby-selenium-webdriver, |
| 20 | ruby-sqlite3, | 20 | ruby-sqlite3, |
| 21 | ruby-tidy, | 21 | ruby-tidy, |
| @@ -59,7 +59,9 @@ Depends: adduser, | @@ -59,7 +59,9 @@ Depends: adduser, | ||
| 59 | ruby-redcloth, | 59 | ruby-redcloth, |
| 60 | ruby-rest-client, | 60 | ruby-rest-client, |
| 61 | ruby-rmagick, | 61 | ruby-rmagick, |
| 62 | + ruby-sass-rails, | ||
| 62 | ruby-tzinfo (>= 1.1.0-2~), | 63 | ruby-tzinfo (>= 1.1.0-2~), |
| 64 | + ruby-uglifier, | ||
| 63 | ruby-whenever, | 65 | ruby-whenever, |
| 64 | ruby-will-paginate (>= 2.3.12-1~), | 66 | ruby-will-paginate (>= 2.3.12-1~), |
| 65 | tango-icon-theme, | 67 | tango-icon-theme, |
script/install-dependencies/debian-wheezy.sh
| 1 | -binary_packages='deb http://download.noosfero.org/debian/wheezy-1.1 ./' | 1 | +binary_packages='deb http://download.noosfero.org/debian/wheezy-1.2 ./' |
| 2 | 2 | ||
| 3 | source_packages=$(echo "$binary_packages" | sed -e 's/^deb/deb-src/') | 3 | source_packages=$(echo "$binary_packages" | sed -e 's/^deb/deb-src/') |
| 4 | 4 | ||
| @@ -53,6 +53,13 @@ FPQAoNmiMgP6zGF9rgOEWMEiFEryayrz | @@ -53,6 +53,13 @@ FPQAoNmiMgP6zGF9rgOEWMEiFEryayrz | ||
| 53 | EOF | 53 | EOF |
| 54 | fi | 54 | fi |
| 55 | 55 | ||
| 56 | +if grep -qrl wheezy /etc/apt/sources.list* && ! grep -qrl wheezy-backports /etc/apt/sources.list*; then | ||
| 57 | + sudo tee /etc/apt/sources.list.d/backports.list <<EOF | ||
| 58 | +deb http://httpredir.debian.org/debian wheezy-backports main | ||
| 59 | +EOF | ||
| 60 | +fi | ||
| 61 | + | ||
| 62 | + | ||
| 56 | if test -f tmp/debian/Release.gpg; then | 63 | if test -f tmp/debian/Release.gpg; then |
| 57 | echo "deb file://$(pwd)/tmp/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list | 64 | echo "deb file://$(pwd)/tmp/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list |
| 58 | sudo apt-key add tmp/debian/signing-key.asc | 65 | sudo apt-key add tmp/debian/signing-key.asc |
| @@ -65,6 +72,9 @@ run sudo apt-get -qy dist-upgrade | @@ -65,6 +72,9 @@ run sudo apt-get -qy dist-upgrade | ||
| 65 | 72 | ||
| 66 | run sudo apt-get -y install dctrl-tools | 73 | run sudo apt-get -y install dctrl-tools |
| 67 | 74 | ||
| 75 | +# *sigh* need ruby-rspec from backports | ||
| 76 | +run sudo apt-get -y install -t wheezy-backports ruby-rspec | ||
| 77 | + | ||
| 68 | # needed to run noosfero | 78 | # needed to run noosfero |
| 69 | packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e '/^\s*#/d; s/([^)]*)//g; s/,\s*/\n/g' | grep -v 'memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent') | 79 | packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debian/control | sed -e '/^\s*#/d; s/([^)]*)//g; s/,\s*/\n/g' | grep -v 'memcached\|debconf\|dbconfig-common\|misc:Depends\|adduser\|mail-transport-agent') |
| 70 | run sudo apt-get -y install $packages | 80 | run sudo apt-get -y install $packages |