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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 2947e77c508e44ad481d81c38d548e0525215a92
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Jan 7 21:10:19 2015 +0100

    Make sure the unity-menubar patch is the last one
---
 dci/mozilla.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

-- 
ci-tooling packaging