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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 806af3cd0cd5807a3d8f3afc73e0a5ddfd9afb46
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Jan 8 13:43:52 2015 +0100

    Make sure we copy over kde.js via debian/rules
---
 dci/mozilla.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 8322647..aad6d9a 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -114,8 +114,11 @@ def build_firefox
 
             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`
+            $logger.info("Modifying debian/rules")
+            rules.gsub!(/pre-build.*$/) {|m|
+                m += "
	mkdir -p $(MOZ_DISTDIR)/bin/defaults/pref/
	cp $(CURDIR)/debian/kde.js $(MOZ_DISTDIR)/bin/defaults/pref/kde.js"
+            }
+            `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`
 
             $logger.info("Building the source package")
             control = DebianControl.new

-- 
ci-tooling packaging