[SCM] ci-tooling packaging branch, master, updated. 5e9b531777e8ff7d1135d9f13c5eca8cb29126b7

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 5e9b531777e8ff7d1135d9f13c5eca8cb29126b7
Author: Rohan Garg <rohan at kde.org>
Date:   Tue Jan 13 17:51:34 2015 +0100

    Use apt-get build-dep instead of parsing control files, this is icky
---
 dci/mozilla.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 2b31c6f..1db9af0 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -122,13 +122,15 @@ def build_firefox
             File.write('debian/rules', rules)
 
             $logger.info("Building the source package")
-            control = DebianControl.new
-            control.parse!
-            build_depends = []
-            control.source['build-depends'].each do |dep|
-                build_depends << dep.name
-            end
-            fail "Failed to install build deps!" unless system("apt-get -y install #{build_depends.join(' ')}")
+            # TODO: Fix the control file parser to take optional build-deps into account
+            # control = DebianControl.new
+            # control.parse!
+            # build_depends = []
+            # control.source['build-depends'].each do |dep|
+            #     build_depends << dep.name
+            # end
+            # fail "Failed to install build deps!" unless system("apt-get -y install #{build_depends.join(' ')}")
+            system("apt-get -y build-dep firefox")
             `dch --release --distribution #{RELEASE} "New firefox release"`
             system("dpkg-buildpackage -S -sa -uc -us")
         }

-- 
ci-tooling packaging