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

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


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

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

    Make sure we refresh patches so there is no fuzz
---
 dci/mozilla.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index acdabe5..bd1c66f 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -110,6 +110,8 @@ def build_firefox
                 f.puts("firefox-kde.patch
mozilla-kde.patch
unity-menubar.patch
")
             }
 
+            system("quilt push -fa")
+            system("quilt refresh")
             # $logger.info("Modifying debian/rules")
             # `sed -i '/^pre-build::/ s/$/ 
	mkdir -p $(MOZ_DISTDIR)\/bin\/defaults\/pref\/
	cp $(CURDIR)\/debian\/kde.js $(MOZ_DISTDIR)\/bin\/defaults\/pref\/kde.js /' debian/rules`
 

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list