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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 020e1ad47c225ed897632c02303eade3b9ac6ed9
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Mar 13 17:12:10 2015 +0100

    Make sure we don't add a version for a native package
---
 dci/source.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dci/source.rb b/dci/source.rb
index 8117480..ef45d79 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -100,7 +100,7 @@ Dir.chdir(ARGV[1]) do
   version_suffix = "+git#{DateTime.now.strftime('%Y%m%d.%H%M')}"
   version = "#{cl.version(Changelog::EPOCH | Changelog::BASE)}#{version_suffix}" # <-- needs git version and bzr version possibly
   tar_version = "#{cl.version(Changelog::BASE)}#{version_suffix}"
-  version += '-1'
+  version += '-1' unless FORMAT == :native
 
   Dir.chdir('source/') do
     FileUtils.rm_rf(Dir.glob('**/.bzr'))

-- 
ci-tooling packaging