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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 1e75d4d729995413d9577c6a7558a1a73505b0a5
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Mar 16 16:09:48 2015 +0100

    Fix tar creation
---
 dci/source.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index 2e502f9..02a8864 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -111,7 +111,7 @@ Dir.chdir(ARGV[1]) do
   # create orig tar
   tar = "#{source_name}_#{tar_version}.orig.tar"
   File.delete(tar) if File.exist? tar
-  fail 'Failed to create a tarball' unless system("tar -cf #{tar} source")
+  fail 'Failed to create a tarball' unless system("tar -cf #{tar} #{source_dir}")
   fail 'Failed to compress the tarball' unless system("xz -6 #{tar}")
 
   system("cp -aR #{PACKAGING_DIR}/debian #{source_dir}") if s.format.type == :quilt
@@ -157,9 +157,9 @@ Dir.chdir(ARGV[1]) do
   end
 
   Dir.mktmpdir do |dir|
-    FileUtils.cp_r("#{ARGV[1]}/source", dir)
+    FileUtils.cp_r("#{ARGV[1]}/#{source_dir}", dir)
     FileUtils.cp_r("#{tar}.xz", dir)
-    Dir.chdir("#{dir}/source") do
+    Dir.chdir("#{dir}/#{source_dir}") do
       # dpkg-buildpackage
       fail 'Failed to build source package' unless system('dpkg-buildpackage -S -uc -us')
     end

-- 
ci-tooling packaging