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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 03dff6e10e35ff0fe4699714423548c7136316b8
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 5 09:19:22 2015 +0200

    Revert "Don't use VERSION_ID, not required"
    
    This reverts commit 3f34fc90c079f67c3eca85dedbaf6e3dd2cb4ca9.
---
 dci/docker_source.rb    | 8 --------
 lib/ci/build_version.rb | 5 +++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dci/docker_source.rb b/dci/docker_source.rb
deleted file mode 100644
index 4c8e935..0000000
--- a/dci/docker_source.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require_relative '../lib/ci/build_source'
-
-ENV['WORKSPACE'] ||= '.'
-
-Dir.chdir(ENV['WORKSPACE']) do
-  build = VcsSource.new
-  build.run(series: 'unstable')
-end
diff --git a/lib/ci/build_version.rb b/lib/ci/build_version.rb
index ba2e884..0d37111 100644
--- a/lib/ci/build_version.rb
+++ b/lib/ci/build_version.rb
@@ -15,8 +15,9 @@ module CI
 
     def initialize(changelog)
       @changelog = changelog
-      @suffix = format('+git%s',
-                       DateTime.now.strftime('%Y%m%d.%H%M'))
+      @suffix = format('+git%s+%s',
+                       DateTime.now.strftime('%Y%m%d.%H%M'),
+                       OS::VERSION_ID)
       @tar = "#{clean_base}#{@suffix}"
       @base = "#{changelog.version(Changelog::EPOCH)}#{clean_base}#{@suffix}"
       @full = "#{base}-0ubuntu0" if OS::ID == 'ubuntu'

-- 
ci-tooling packaging