From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 25 May 2013 13:03:26 +0000 (+0100)
Subject: Should be ok without that workaround now - packaging bug is fixed
X-Git-Tag: 0.1~565
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=10b90bd524fd31766201956ae6e92f2981312077;p=fdroidserver.git

Should be ok without that workaround now - packaging bug is fixed
---

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index b26a5603..898ef0cc 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -1,17 +1,4 @@
 
-script "temp-proposed" do
-  interpreter "bash"
-  user node[:settings][:user]
-  cwd "/tmp"
-  code "
-    sudo su -c 'echo deb http://archive.ubuntu.com/ubuntu/ raring-proposed restricted main multiverse universe >/etc/apt/sources.list.d/tmp.list'
-    sudo apt-get update
-  "
-  not_if do
-    File.exists?("/etc/apt/sources.list.d/tmp.list")
-  end
-end
-
 %w{ant ant-contrib autoconf autopoint bison cmake expect libtool libssl1.0.0 libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby}.each do |pkg|
   package pkg do
     action :install