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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit f4eb73cf90816179dbe2bf88f4dcb1d56227c6d2
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Jan 14 15:09:19 2015 +0100

    Better detection of what release we're deploying for
---
 dci/mozilla.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 48abde0..f95292e 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -87,7 +87,7 @@ def build_firefox
         Dir.chdir(firefox_dir) {
             changelog = Changelog.new
             version = "#{changelog.version(Changelog::BASE)}"
-            if RELEASE == 'sid' || RELEASE == 'unstable'
+            if DEBIAN_RELEASES.include? RELEASE
                 version += '-1'
                 File.open('debian/config/mozconfig.in', 'a') { |f|
                     f.puts("ac_add_options --enable-gstreamer=1.0
")
@@ -158,7 +158,11 @@ def build_thunderbird
 end
 
 run_cmd('apt-get update')
-run_cmd('apt-get -y install ubuntu-dev-tools mercurial ruby-nokogiri')
+run_cmd('apt-get -y install ubuntu-dev-tools mercurial ruby-nokogiri distro-info')
+
+UBUNTU_RELEASES = `ubuntu-distro-info -a`.split
+DEBIAN_RELEASES = `debian-distro-info -a`.split
+
 
 build_firefox if PACKAGE == 'firefox'
 build_thunderbird if PACKAGE == 'thunderbird'

-- 
ci-tooling packaging