aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/packages4
-rwxr-xr-xscript/rails-post-deploy4
2 files changed, 3 insertions, 5 deletions
diff --git a/config/packages b/config/packages
index f4d0a674c..5d6622c30 100644
--- a/config/packages
+++ b/config/packages
@@ -4,8 +4,8 @@
ruby1.8
ruby
libopenssl-ruby1.8 # needed for Ubuntu 10.04 TLS; included in libruby1.8 in Squeeze
-rdoc
-irb
+rdoc | rdoc1.8
+irb | irb1.8
wv
poppler-utils
pdftk (>> 1.41+dfsg-1) | pdftk (<< 1.41+dfsg-1) # that version has a non-functionining uncompress option
diff --git a/script/rails-post-deploy b/script/rails-post-deploy
index a3257cf35..f7ed8178b 100755
--- a/script/rails-post-deploy
+++ b/script/rails-post-deploy
@@ -91,9 +91,7 @@ then
fi
bundle install $bundle_install_options
-bundle exec rake themes:install
-
# upgrade database
bundle exec rake db:migrate #--trace
-
+bundle exec rake themes:install