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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 038a925dea54f9f820d6b274f1c286b378f44664
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Apr 1 18:00:44 2015 +0200

    Use the os module instead of the lsb module in build_version
---
 lib/ci/build_version.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ci/build_version.rb b/lib/ci/build_version.rb
index 71ac0f1..0d37111 100644
--- a/lib/ci/build_version.rb
+++ b/lib/ci/build_version.rb
@@ -1,6 +1,6 @@
 require 'date'
 
-require_relative '../lsb'
+require_relative '../os'
 
 module CI
   # Wraps a debian changelog to construct a build specific version based on the
@@ -17,10 +17,11 @@ module CI
       @changelog = changelog
       @suffix = format('+git%s+%s',
                        DateTime.now.strftime('%Y%m%d.%H%M'),
-                       LSB::DISTRIB_RELEASE)
+                       OS::VERSION_ID)
       @tar = "#{clean_base}#{@suffix}"
       @base = "#{changelog.version(Changelog::EPOCH)}#{clean_base}#{@suffix}"
-      @full = "#{base}-0ubuntu0"
+      @full = "#{base}-0ubuntu0" if OS::ID == 'ubuntu'
+      @full = "#{base}-1" if OS::ID == 'debian'
     end
 
     # Version (including epoch AND possibly a revision)

-- 
ci-tooling packaging