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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 5c0f3f0ef7681173e9d5a54da35aada38860525f
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jul 1 23:12:01 2015 +0200

    Use pbuilder's algorithm to satisfy deps
---
 dci/build.rb | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/dci/build.rb b/dci/build.rb
index 8757075..0268544 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -67,7 +67,7 @@ else
   system('apt-get -y dist-upgrade')
 
   logger.info('Installing some extra tools')
-  system('apt-get -y install devscripts ubuntu-dev-tools libdistro-info-perl')
+  system('apt-get -y install aptitude devscripts pbuilder ubuntu-dev-tools libdistro-info-perl')
 
   logger.info('Extracting source')
   Dir.mktmpdir do |dir|
@@ -77,21 +77,7 @@ else
 
       package_folder = Dir.glob("#{package_name}*").select { |fn| File.directory? fn }
       Dir.chdir(package_folder[0]) do
-        logger.info('Figuring out build deps')
-        c = DebianControl.new
-        c.parse!
-        build_depends = []
-
-        c.source.fetch('build-depends', []).each do |dep|
-          build_depends << dep.name
-        end
-
-        c.source.fetch('build-depends-indep', []).each do |dep|
-          build_depends << dep.name
-        end
-
-        logger.info("Installing build deps : #{build_depends}")
-        system("apt-get -y install #{build_depends.join(' ')}")
+        system('/usr/lib/pbuilder/pbuilder-satisfydepends')
         fail "Can't install build deps!" unless $?.success?
         logger.info('Finished installing build deps')
 

-- 
ci-tooling packaging