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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Tue Jan 27 14:03:40 UTC 2015


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

The following commit has been merged in the master branch:
commit 3cb5c67808486b6ade661a8c0d61f281377a83e1
Author: Rohan Garg <rohan at kde.org>
Date:   Tue Jan 27 15:03:17 2015 +0100

    Make sure control file is refreshed as soon as the control.in file is written
---
 dci/mozilla.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 8cb82ff..1680333 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -98,10 +98,11 @@ def add_dummy_package
   control += "
Package: @MOZ_PKG_NAME at -plasma
   Architecture: any
   Depends: @MOZ_PKG_NAME@ (= ${binary:Version}), firefox-kde-support
-  Description:
+  Description: #{PACKAGE} package for integration with KDE
   Install this package if you'd like #{PACKAGE} with Plasma integration
   "
   File.write('debian/control.in', control)
+  system('debian/rules debian/control')
 
   File.open("debian/#{PACKAGE}-plasma.pref", 'w') do |f|
     f.puts("Package: *
@@ -197,7 +198,6 @@ Dir.chdir('build') do
   build_firefox(release_info) if PACKAGE == 'firefox'
   build_thunderbird(release_info) if PACKAGE == 'thunderbird'
 
-  system('debian/rules debian/control')
   `dch --release --distribution #{RELEASE} ""`
   src_dir = Dir["#{PACKAGE}-*"][0]
   Dir.chdir(src_dir) do

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list