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

[Rohan Garg]

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

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

    Fix things
---
 dci/source.rb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index e938af4..9adb2ff 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -101,13 +101,7 @@ 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
+    # Rip out locale install and upstream patches
     Dir.chdir('source/') do
         Dir.glob('debian/*.install').each do | install_file_path |
             # Strip localized manpages
@@ -133,6 +127,13 @@ Dir.chdir(ARGV[1]) do
           $logger.info("#{package_name} is now empty, trying to add lintian override")
           File.open(lintian_overrides_path, 'a') { |file| file.write("#{package_name}: empty-binary-package
") }
         end
+
+        # Rip out upstream patches
+        if File.exist? 'debian/patches/series'
+          series = File.read('debian/patches/series')
+          series.gsub!(/^upstream_*/, '')
+          File.write('debian/patches/series', series)
+        end
     end
 
     Dir.mktmpdir do |dir|

-- 
ci-tooling packaging