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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit edb5f0d6b57bdbd815c85fb08bb1dabf8fbc5088
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Dec 2 19:37:37 2015 +0100

    Make sure to copy everything from the source dir for native packages
---
 lib/ci/build_source.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index eb3494b..bf36894 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -43,10 +43,14 @@ module CI
       FileUtils.rm_rf(BUILD_DIR, verbose: true)
       FileUtils.mkpath("#{BUILD_DIR}/source")
 
-      unless @source.type == :native
-        FileUtils.cp_r(Dir.glob('source/*'), 'build/source/', verbose: true)
+      if @source.type == :quilt
+        source_dir = 'source'
+      else
+        source_dir = 'packaging'
       end
 
+      FileUtils.cp_r(Dir.glob("#{source_dir}/*"), 'build/source/', verbose: true)
+
       %w(.bzr .git .hg .svn debian).each do |dir|
         FileUtils.rm_rf(Dir.glob("build/source/**/#{dir}"))
       end

-- 
ci-tooling packaging