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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Wed Jan 14 13:26:36 UTC 2015


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

The following commit has been merged in the master branch:
commit 2281ec9f70039c1e2c7a8d2be0170a623818150c
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Jan 14 14:26:13 2015 +0100

    Make sure we refresh the control file after we install the build-deps
---
 dci/mozilla.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 99b862b..48abde0 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -134,7 +134,6 @@ Description: Safe and easy web browser from Mozilla - Plasma edition
  Install this package if you'd like Firefox with Plasma integration
  "
             File.write('debian/control.in', control)
-            system("debian/rules debian/control")
 
             $logger.info("Building the source package")
             # TODO: Fix the control file parser to take optional build-deps into account
@@ -146,6 +145,7 @@ Description: Safe and easy web browser from Mozilla - Plasma edition
             # end
             # fail "Failed to install build deps!" unless system("apt-get -y install #{build_depends.join(' ')}")
             system("apt-get -y build-dep firefox")
+            system("debian/rules debian/control")
             `dch --release --distribution #{RELEASE} "New firefox release"`
             system("dpkg-buildpackage -S -sa -uc -us")
         }

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list