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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 7e8bd2660d58a345ce18c678cf77bc84482820dd
Author: Rohan Garg <rohan at kde.org>
Date:   Mon Jan 26 12:31:01 2015 +0100

    Make sure we run dpkg-buildpackage in the new dir
---
 dci/mozilla.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 278f4c7..9f3b548 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -88,9 +88,10 @@ def build_firefox
     Dir.mkdir('build')
     Dir.chdir('build') {
         fail "Can't download firefox!" unless system("pull-lp-source firefox #{RELEASE}")
-        firefox_dir = Dir["firefox-*"][0]
 
         system("hg clone http://www.rosenauer.org/hg/mozilla/#firefox#{release_info[:ubuntu].to_i} suse")
+
+        firefox_dir = Dir["firefox-*"][0]
         Dir.chdir(firefox_dir) {
             changelog = Changelog.new
             version = "1000~#{changelog.version(Changelog::BASE)}"
@@ -174,8 +175,14 @@ Pin-Priority: 1000
             system("apt-get -y build-dep firefox")
             system("debian/rules debian/control")
             `dch --release --distribution #{RELEASE} ""`
+        }
+
+        # Run dpkg-buildpackage in new dir
+        firefox_dir = Dir["firefox-*"][0]
+        Dir.chdir(firefox_dir) {
             system("dpkg-buildpackage -S -sa -uc -us")
         }
+
         system('dcmd cp firefox*.changes /build/')
     }
 end

-- 
ci-tooling packaging