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

[Rohan Garg]

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

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

    Switch to a unified version between DCI and KCI
    
    Both DCI and KCI will build with suffix -0 now.
---
 lib/ci/build_version.rb       | 3 +--
 test/test_ci_build_version.rb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/ci/build_version.rb b/lib/ci/build_version.rb
index 7a02d9f..761a7fa 100644
--- a/lib/ci/build_version.rb
+++ b/lib/ci/build_version.rb
@@ -20,8 +20,7 @@ module CI
       @suffix = format('+git%s+%s', time, OS::VERSION_ID)
       @tar = "#{clean_base}#{@suffix}"
       @base = "#{changelog.version(Changelog::EPOCH)}#{clean_base}#{@suffix}"
-      @full = "#{base}-0ubuntu0" if OS::ID == 'ubuntu'
-      @full = "#{base}-1" if OS::ID == 'debian'
+      @full = "#{base}-0"
     end
 
     # Version (including epoch AND possibly a revision)
diff --git a/test/test_ci_build_version.rb b/test/test_ci_build_version.rb
index 4967480..b4ab68a 100644
--- a/test/test_ci_build_version.rb
+++ b/test/test_ci_build_version.rb
@@ -47,7 +47,7 @@ class CIBuildVersionTest < TestCase
     # Check actual versions.
     assert_equal("4:5.2.2#{suffix}", v.base)
     assert_equal("5.2.2#{suffix}", v.tar)
-    assert_equal("4:5.2.2#{suffix}-0ubuntu0", v.full)
+    assert_equal("4:5.2.2#{suffix}-0", v.full)
     assert_equal(v.full, v.to_s)
   end
 

-- 
ci-tooling packaging