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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 48a24f0232cb2ef5335b857a2f1f55ba55db58c2
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 12 11:13:48 2015 +0200

    use latest_series in builder to replace hardcoded values
---
 kci/builder.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index f20f1aa..7ca454e 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -8,6 +8,7 @@ require 'timeout'
 require_relative 'lib/ci/build_version'
 require_relative 'lib/debian/changelog'
 require_relative 'lib/cmake_parser'
+require_relative 'lib/kci'
 require_relative 'lib/lint/control'
 require_relative 'lib/lint/result'
 require_relative 'lib/lint/series'
@@ -156,8 +157,8 @@ Dir.chdir('build/source/') do
       file.write("#{package_name}: empty-binary-package
")
     end
   end
-  # Rip out symbol files unless we are on vivid
-  unless project.series == 'vivid'
+  # Rip out symbol files unless we are on latest
+  unless project.series == KCI.latest_series
     symbols = Dir.glob('debian/symbols') +
               Dir.glob('debian/*.symbols') +
               Dir.glob('debian/*.symbols.*')
@@ -361,7 +362,7 @@ log_data = File.open("logs/#{archindep}.log").read
 updated_symbols = false
 # FIXME: stability wtf
 gensymbols_regex = %r{dpkg-gensymbols: warning: (.*)/symbols doesn't match completely debian/(.*).symbols}
-if project.series == 'vivid' && log_data.match(gensymbols_regex)
+if project.series == KCI.latest_series && log_data.match(gensymbols_regex)
   puts 'KCI::SYMBOLS'
   if log_data.include?('dpkg-gensymbols: warning: some new symbols appeared')
     match = log_data.match(/--- debian\/(.*).symbols/)

-- 
ci-tooling packaging