From f2ca5550a822cf9e0572d894050811a2c9f9d4ec Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Sat, 23 Jan 2016 10:46:08 +0100 Subject: [PATCH 1/2] Working '%__scm_apply_quilt' macro. This nacro is called in '%apply_patch' as the recipient of a pipe. Unfortunately, 'quilt import' only works on 'real' files and does not read from STDIN (like 'quilt import -'). We circumvene this restriction with a temporary file(name). This modified macro has successfully been tested on Kubuntu 12.04.5 with 'quilt 0.50' and 'debbuild 16.1.6' (https://github.com/ascherer/debbuild). --- macros.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/macros.in b/macros.in index f11affe7a8..3cbd449e8d 100644 --- a/macros.in +++ b/macros.in @@ -1106,7 +1106,9 @@ done \ # Quilt %__scm_setup_quilt(q) %{nil} %__scm_apply_quilt(qp:m:)\ -%{__quilt} import %{-p:-p%{-p*}} %{1} && %{__quilt} push +%{__cat} > %{-m*}.quilt\ +%{__quilt} import %{-p:-p%{-p*}} %{-m*}.quilt && %{__quilt} push\ +%{__rm} -f %{-m*}.quilt # Bzr %__scm_setup_bzr(q)\ From 5024a5416d462605a33ce861406cc7794979fac3 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Sat, 23 Jan 2016 19:51:22 +0100 Subject: [PATCH 2/2] At least 'quilt push' has option '-q' (quiet operation). --- macros.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.in b/macros.in index 3cbd449e8d..660d1aaeef 100644 --- a/macros.in +++ b/macros.in @@ -1107,7 +1107,7 @@ done \ %__scm_setup_quilt(q) %{nil} %__scm_apply_quilt(qp:m:)\ %{__cat} > %{-m*}.quilt\ -%{__quilt} import %{-p:-p%{-p*}} %{-m*}.quilt && %{__quilt} push\ +%{__quilt} import %{-p:-p%{-p*}} %{-m*}.quilt && %{__quilt} push %{-q}\ %{__rm} -f %{-m*}.quilt # Bzr