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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit fb86549878e7f72e721811f99a26282474995e70
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Oct 8 22:24:56 2015 +0200

    Revert "Skip if package is native"
    
    This reverts commit ab4f2bd76042337f4d402db5fff2a17602099898.
---
 dci/source.rb          | 2 +-
 lib/ci/build_source.rb | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index db33f8e..e5fdd67 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -92,7 +92,7 @@ Dir.chdir(ARGV[1]) do
     FileUtils.rm_rf(Dir.glob('**/.bzr'))
     FileUtils.rm_rf(Dir.glob('**/.git'))
     FileUtils.rm_rf(Dir.glob('**/.svn'))
-    FileUtils.rm_rf(Dir.glob('**/debian')) unless s.format.type == :native
+    FileUtils.rm_rf(Dir.glob('**/debian'))
   end
 
   # create orig tar
diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index bebc8bd..47fd4fe 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -43,9 +43,6 @@ class VcsSourceBuilder
     end
 
     %w(.bzr .git .hg .svn debian).each do |vcsdir|
-      # Skip debian dir if native package
-      next if vcsdir == 'debian' && @source.type == :native
-
       FileUtils.rm_rf(Dir.glob("build/source/**/#{vcsdir}"))
     end
   end

-- 
ci-tooling packaging