[SCM] ci-tooling packaging branch, master, updated. 224fe6e9f1895ac098285a1e079aec54d2800dce

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 224fe6e9f1895ac098285a1e079aec54d2800dce
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Mar 26 17:52:35 2015 +0100

    Only install essential stuff and set the var more properly
---
 dci/mozilla.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index f55dbe8..04b8b7c 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -13,7 +13,6 @@ fail 'Need a release to build for!' unless ARGV[2]
 $logger = DCILogger.instance
 
 PACKAGE = ARGV[1]
-RELEASE = ARGV[2]
 
 $logger.info("Building #{PACKAGE}")
 
@@ -22,6 +21,8 @@ def package_releases
   threads = []
   ubuntu_versions = []
   upstream_versions = []
+  release = UBUNTU_RELEASES[-1] if DEBIAN_RELEASES.include? release
+
   threads << Thread.new do
     # Find the latest release from the Mozilla releases page
     begin
@@ -169,7 +170,7 @@ def build_thunderbird(release_info)
     system('quilt push -fa')
     system('quilt refresh')
 
-    open('debian/kde.js', 'wb') do | file |
+    open('debian/kde.js', 'wb') do |file|
       file << open('https://build.opensuse.org/source/openSUSE:Factory/MozillaThunderbird/kde.js').read
     end
     install_kde_js
@@ -188,11 +189,13 @@ 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 build-dep #{PACKAGE}")
+system('apt-get -y install cdbs debhelper')
 
 UBUNTU_RELEASES = `ubuntu-distro-info -a`.split
 DEBIAN_RELEASES = `debian-distro-info -a`.split
 
+RELEASE = (DEBIAN_RELEASES.include? ARGV[2]) ? UBUNTU_RELEASES[-1] : ARGV[2]
+
 release_info = package_releases
 if release_info[:ubuntu] < release_info[:upstream]
   $logger.error("Can't build new #{PACKAGE}, Ubuntu hasn't updated the package!")

-- 
ci-tooling packaging