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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Wed Jan 7 20:54:58 UTC 2015


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

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

    Patches need to be applied specifically in this order
---
 dci/mozilla.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index bd1c66f..270987e 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -107,7 +107,8 @@ def build_firefox
 
             $logger.info("Adding Firefox KDE patches")
             File.open('debian/patches/series', 'a') { |f|
-                f.puts("firefox-kde.patch
mozilla-kde.patch
unity-menubar.patch
")
+                # Please preserve this order of patch
+                f.puts("mozilla-kde.patch
firefox-kde.patch
unity-menubar.patch
")
             }
 
             system("quilt push -fa")

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list