[SCM] ci-tooling packaging branch, master, updated. 14c12d69614cae30f2277fbe4238b71108199b6e

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 14c12d69614cae30f2277fbe4238b71108199b6e
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 25 08:33:50 2015 +0100

    fix builder symbol versioning, it needs to include the epoch
---
 kci/builder.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index f7a4fdf..41cf657 100644
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -65,9 +65,9 @@ eval %x[grep VERSION_ID /etc/os-release].strip
 
 source_name = $changelog.name
 version_suffix = "+git#{DateTime.now().strftime('%Y%m%d.%H%M')}+#{VERSION_ID}"
-version = "#{$changelog.version(Changelog::EPOCH | Changelog::BASE)}#{version_suffix}" # <-- needs git version and bzr version possibly
+base_version = "#{$changelog.version(Changelog::EPOCH | Changelog::BASE)}#{version_suffix}" # <-- needs git version and bzr version possibly
 tar_version = "#{$changelog.version(Changelog::BASE)}#{version_suffix}"
-version += "-0ubuntu0"
+version = "#{base_version}-0ubuntu0"
 
 # copy sources around
 FileUtils.rm_r('build') if File.exist?('build')
@@ -373,8 +373,8 @@ if project.stability == 'unstable' && log_data.match(/dpkg-gensymbols: warning:
                 system('git reset --hard')
                 captures = match.captures
                 captures.each do |lib_package|
-                    puts "pkgkde-symbolshelper batchpatch -v #{tar_version} -c #{architectures_with_log.join(',')} #{logs.join(' ')}"
-                    system("pkgkde-symbolshelper batchpatch -v #{tar_version} -c #{architectures_with_log.join(',')} #{logs.join(' ')}")
+                    puts "pkgkde-symbolshelper batchpatch -v #{base_version} -c #{architectures_with_log.join(',')} #{logs.join(' ')}"
+                    system("pkgkde-symbolshelper batchpatch -v #{base_version} -c #{architectures_with_log.join(',')} #{logs.join(' ')}")
                     updated_symbols = ($? == 0)
                     puts_info("Auto-updated symbols of #{lib_package}")
                 end

-- 
ci-tooling packaging