[SCM] ci-tooling packaging branch, master, updated. 4879016a7c7d6fd496ec14a73a8771c4b69b8f1f

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=4879016

The following commit has been merged in the master branch:
commit 4879016a7c7d6fd496ec14a73a8771c4b69b8f1f
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Mar 26 18:00:59 2015 +0100

    Install everything in one go
---
 dci/mozilla.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 04b8b7c..fa4a94b 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -179,7 +179,8 @@ def build_thunderbird(release_info)
 end
 
 dci_run_cmd('apt-get update')
-system('apt-get -y install ubuntu-dev-tools mercurial ruby-nokogiri distro-info')
+packages = %w(ubuntu-dev-tools mercurial ruby-nokogiri distro-info cdbs debhelper)
+system("apt-get -y install #{packages}")
 
 # TODO: Fix the control file parser to take optional build-deps into account
 # control = DebianControl.new
@@ -189,7 +190,6 @@ system('apt-get -y install ubuntu-dev-tools mercurial ruby-nokogiri distro-info'
 #     build_depends << dep.name
 # end
 # fail "Failed to install build deps!" unless system("apt-get -y install #{build_depends.join(' ')}")
-system('apt-get -y install cdbs debhelper')
 
 UBUNTU_RELEASES = `ubuntu-distro-info -a`.split
 DEBIAN_RELEASES = `debian-distro-info -a`.split

-- 
ci-tooling packaging