From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 25 May 2013 12:58:58 +0000 (+0100)
Subject: Temporary workaround for maven packaging bug
X-Git-Tag: 0.1~569
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f7d99ed5214ef1d7c5a42b768685ece59e9e93d0;p=fdroidserver.git

Temporary workaround for maven packaging bug

See https://bugs.launchpad.net/bugs/1171056
---

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index a0cb5d09..7244b794 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -1,5 +1,18 @@
 
-%w{ant ant-contrib autoconf autopoint bison cmake 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|
+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
   end