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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 65fc4513f198820cf226076f02855ce669a47292
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Jan 7 19:39:27 2015 +0100

    Use the right logger variable
---
 dci/mozilla.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 736e2e6..33aaa79 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -73,7 +73,7 @@ end
 def build_firefox
     release_info = firefox_releases
     if release_info[:ubuntu] < release_info[:upstream]
-        logger.error("Can't build new firefox, Ubuntu hasn't updated the package!")
+        $logger.error("Can't build new firefox, Ubuntu hasn't updated the package!")
         exit 0
     end
 
@@ -96,21 +96,21 @@ def build_firefox
                 version += changelog.version(Changelog::REVISION).next
             end
             version += "~#{DateTime.now.strftime('%Y%m%d.%H%M')}"
-            logger.info("New version is going to be #{version}")
+            $logger.info("New version is going to be #{version}")
             `dch -v "#{version}" ""`
 
             `cp ../suse/firefox-kde.patch ../suse/mozilla-kde.patch debian/patches/`
             `cp ../suse/MozillaFirefox/kde.js debian/`
 
-            logger.info("Adding Firefox KDE patches")
+            $logger.info("Adding Firefox KDE patches")
             File.open('debian/patches/series', 'a') { |f|
                 f.puts('firefox-kde.patch
mozilla-kde.patch
')
             }
 
-            logger.info("Modifying debian/rules")
+            $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("Building the source package")
+            $logger.info("Building the source package")
             control = DebianControl.new
             control.parse!
             control.source['build-depends'].each do |dep|

-- 
ci-tooling packaging