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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit f76f4898309686521444f826cc17fce7d8a7d168
Author: Rohan Garg <rohan at garg.io>
Date:   Tue May 5 14:42:07 2015 +0200

    Use version builder for building the source
---
 lib/ci/build_source.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index 8a15c69..8b353f0 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -4,6 +4,7 @@ require 'fileutils'
 require_relative '../debian/changelog'
 require_relative '../os'
 require_relative '../debian/source'
+require_relative 'build_version'
 
 class AbstractSource
   attr_reader :package_name
@@ -20,7 +21,7 @@ class VcsSource < AbstractSource
     FileUtils.rm_r('build') if File.exist?('build')
     FileUtils.mkpath('build/source/')
 
-    ## All done for native packages
+    # All done for native packages
     return if @source.format.type == :native
 
     FileUtils.cp_r(Dir.glob('source/*'), 'build/source/', verbose: true)
@@ -115,7 +116,9 @@ class VcsSource < AbstractSource
     @package_name = changelog.name
     version_suffix = "+git#{DateTime.now().strftime('%Y%m%d.%H%M')}+#{VERSION_ID}"
     @tar_version = "#{changelog.version(Changelog::BASE)}#{version_suffix}"
-    @package_version = "#{changelog.version(Changelog::EPOCH | Changelog::BASE)}#{version_suffix}-0"
+    build_version = CI::BuildVersion.new(cl)
+    @package_version = build_version.full if @source.format.type == :native
+    @package_version = build_version.base if @source.format.type == :quilt
 
     copy_source
     create_orig_tar

-- 
ci-tooling packaging