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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit a6e1f9d24022d5b90fb347b473fc77b25eed5b78
Author: Rohan Garg <rohan at garg.io>
Date:   Tue May 19 20:51:46 2015 +0200

    Build out versions from CI::BuildVersion
---
 lib/ci/build_source.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index db83aff..aefdec3 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -108,17 +108,10 @@ class VcsSource < AbstractSource
       changelog = Changelog.new
     end
 
-    # Note that the kubuntu version needs to be part of the *base* version as otherwise
-    # different series uploads can end up with exactly the same tar name and launchpad
-    # freaks out. So, kubuntu version in base/suffix not revision/suffix.
-    eval `grep VERSION_ID /etc/os-release`.strip
-
-    @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}"
     build_version = CI::BuildVersion.new(changelog)
     @package_version = build_version.full if @source.format.type == :native
     @package_version = build_version.base if @source.format.type == :quilt
+    @tar_version = build_version.tar
 
     copy_source
     create_orig_tar

-- 
ci-tooling packaging