Download as
Browse Code »

Commit 141e3e6f95514c9343bfea1c87279fc8eeacc67d

Authored by Antonio Terceiro
1 parent 12d04695
Exists in master and in 26 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

New dependencies

Showing 3 changed files with 17 additions and 5 deletions   Show diff stats
Gemfile
  Diff comments   View file @141e3e6
... ... @@ -30,8 +30,8 @@ group :production do
30 30 end
31 31  
32 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 35 gem 'mocha', '~> 1.1.0', :require => false
36 36 end
37 37  
... ...
debian/control
  Diff comments   View file @141e3e6
... ... @@ -14,8 +14,8 @@ Build-Depends: cucumber,
14 14 ruby-database-cleaner,
15 15 ruby-gettext,
16 16 ruby-mocha,
17   - ruby-rspec,
18   - ruby-rspec-rails,
  17 + ruby-rspec (>= 2.14),
  18 + ruby-rspec-rails (>= 2.14),
19 19 ruby-selenium-webdriver,
20 20 ruby-sqlite3,
21 21 ruby-tidy,
... ... @@ -59,7 +59,9 @@ Depends: adduser,
59 59 ruby-redcloth,
60 60 ruby-rest-client,
61 61 ruby-rmagick,
  62 + ruby-sass-rails,
62 63 ruby-tzinfo (>= 1.1.0-2~),
  64 + ruby-uglifier,
63 65 ruby-whenever,
64 66 ruby-will-paginate (>= 2.3.12-1~),
65 67 tango-icon-theme,
... ...
script/install-dependencies/debian-wheezy.sh
  Diff comments   View file @141e3e6
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 3 source_packages=$(echo "$binary_packages" | sed -e 's/^deb/deb-src/')
4 4  
... ... @@ -53,6 +53,13 @@ FPQAoNmiMgP6zGF9rgOEWMEiFEryayrz
53 53 EOF
54 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 63 if test -f tmp/debian/Release.gpg; then
57 64 echo "deb file://$(pwd)/tmp/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list
58 65 sudo apt-key add tmp/debian/signing-key.asc
... ... @@ -65,6 +72,9 @@ run sudo apt-get -qy dist-upgrade
65 72  
66 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 78 # needed to run noosfero
69 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 80 run sudo apt-get -y install $packages
... ...