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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit e02df5deaacaf3f318baa609f7dfbd534b10be33
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Feb 18 20:18:09 2015 +0100

    Disable upstream patches
---
 dci/source.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dci/source.rb b/dci/source.rb
index 08e3147..e938af4 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -101,6 +101,12 @@ Dir.chdir(ARGV[1]) do
                                                                 "dch -b -v #{version} -D #{options[:release]} 'Automatic Debian Build'")
     end
 
+    if File.exist? 'debian/patches/series'
+      series = File.read('debian/patches/series')
+      series.gsub!(/^upstream_*/, '')
+      File.write('debian/patches/series', series)
+    end
+
     # Rip out locale install
     Dir.chdir('source/') do
         Dir.glob('debian/*.install').each do | install_file_path |

-- 
ci-tooling packaging