[SCM] ci-tooling packaging branch, master, updated. 89103d5aed495455e6022eb802e4c8ed4e4cce5e

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 89103d5aed495455e6022eb802e4c8ed4e4cce5e
Author: Rohan Garg <rohan at kde.org>
Date:   Tue Jan 27 16:37:58 2015 +0100

    dpkg-buildpackage is shit, it doesn't take the -p argument into account
---
 dci/mozilla.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dci/mozilla.rb b/dci/mozilla.rb
index 9c69ed4..1fc3e75 100644
--- a/dci/mozilla.rb
+++ b/dci/mozilla.rb
@@ -156,9 +156,10 @@ def build_thunderbird(release_info)
     open('debian/patches/mozilla-kde.patch', 'wb') do | file |
       file << open('https://build.opensuse.org/source/openSUSE:Factory/MozillaThunderbird/mozilla-kde.patch').read
     end
-    filterdiff = `filterdiff --addprefix=mozilla/ --strip 1 debian/patches/mozilla-kde.patch`
+    filterdiff = `filterdiff --addprefix=a/mozilla/ --strip 1 debian/patches/mozilla-kde.patch`
+    system('quilt pop -fa')
     File.write('debian/patches/mozilla-kde.patch', filterdiff)
-    File.write('debian/patches/series', "mozilla-kde.patch -p0
", mode: 'a')
+    File.write('debian/patches/series', "mozilla-kde.patch
", mode: 'a')
     system('quilt push -fa')
     system('quilt refresh')
 

-- 
ci-tooling packaging