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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit f09f50ab6d8145b6f357372e86ce7f1397c66422
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Jan 7 22:17:09 2015 +0100

    Make sure we pop patches first
---
 dci/mozilla.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 270987e..7465b61 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -102,8 +102,9 @@ def build_firefox
             `cp ../suse/firefox-kde.patch ../suse/mozilla-kde.patch debian/patches/`
             `cp ../suse/MozillaFirefox/kde.js debian/`
 
+            system("quilt pop -a")
             # Need to remove unity menubar from patches first since it interferes with the KDE patches
-            `quilt delete unity-menubar.patch`
+            system("quilt delete unity-menubar.patch")
 
             $logger.info("Adding Firefox KDE patches")
             File.open('debian/patches/series', 'a') { |f|

-- 
ci-tooling packaging