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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit bc4370582f5a0e9c06d262dfb81a80c8c5902f99
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Dec 4 18:44:38 2014 +0100

    Update source.rb with better paths
---
 dci/source.rb | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index 83cd118..f77ab93 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -8,7 +8,7 @@ release = `lsb_release -r`.split(':')[-1].strip
 
 Dir.chdir(ARGV[1]) do
     # Get source name and what not
-    Dir.chdir('build/packaging') do
+    Dir.chdir('packaging') do
         $changelog = Changelog.new
     end
 
@@ -17,30 +17,28 @@ Dir.chdir(ARGV[1]) do
     version = "#{$changelog.version(Changelog::EPOCH | Changelog::BASE)}#{version_suffix}" # <-- needs git version and bzr version possibly
     tar_version = "#{$changelog.version(Changelog::BASE)}#{version_suffix}"
     version += '-1'
-    
-    Dir.chdir('build/source/') do
+
+    Dir.chdir('source/') do
         FileUtils.rm_rf(Dir.glob('**/.bzr'))
         FileUtils.rm_rf(Dir.glob('**/.git'))
         FileUtils.rm_rf(Dir.glob('**/.svn'))
     end
 
     # create orig tar
-    Dir.chdir('build/') do
-        tar = "#{source_name}_#{tar_version}.orig.tar"
-        raise 'Failed to create a tarball' unless system("tar -cf #{tar} source")
-        raise 'Failed to compress the tarball' unless system("xz -6 #{tar}")
-    end
+    tar = "#{source_name}_#{tar_version}.orig.tar"
+    raise 'Failed to create a tarball' unless system("tar -cf #{tar} source")
+    raise 'Failed to compress the tarball' unless system("xz -6 #{tar}")
+
+    system("cp -aR build/packaging/debian source/")
 
-    system("cp -aR build/packaging/debian build/source/")
-    
-    Dir.chdir('build/source/') do
+    Dir.chdir('source/') do
         raise 'Failed to create changelog entry' unless system({'DEBFULLNAME' => 'Debian CI',
                                                                 'DEBEMAIL' => 'null at debian.org'},
                                                                 "dch -b -v #{version} -D #{release} 'Automatic Debian Build'")
     end
-    
+
     # Rip out locale install
-    Dir.chdir('build/source/') do
+    Dir.chdir('source/') do
         Dir.glob('debian/*.install').each do | install_file_path |
             # Strip localized manpages
             # e.g.  usr /share /man /  *  /man 7 /kf5options.7
@@ -66,9 +64,9 @@ Dir.chdir(ARGV[1]) do
             File.open(lintian_overrides_path, 'a') { |file| file.write("#{package_name}: empty-binary-package
") }
         end
     end
-    
+
     # dpkg-buildpackage
-    Dir.chdir('build/source/') do
+    Dir.chdir('source/') do
         raise 'Failed to build source package' unless system("dpkg-buildpackage -S -uc -us")
     end
 end

-- 
ci-tooling packaging