From bcd2df0a90f5644071ff669560e53f0e3086c640 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sat, 13 Feb 2016 11:10:37 +0000 Subject: [PATCH] bin/mdw-sbuild: Merge the various changes files together. Organization: Straylight/Edgeware From: Mark Wooding Now there's only one thing which needs to be uploaded to the archive. --- bin/mdw-sbuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/mdw-sbuild b/bin/mdw-sbuild index be687f6..5630dab 100755 --- a/bin/mdw-sbuild +++ b/bin/mdw-sbuild @@ -99,7 +99,13 @@ rc=$?; set -e rsync -a "$host:$builddir/" ./ case $rc in 0) ;; *) exit $rc ;; esac -## Maybe sign the result. +## Merge the change files together, and maybe sign the result. +chchch=${pkg}_${ver}_source.changes +for i in "${pkg}_${ver}"_*.changes; do + case " $chchch " in *" $i "*) ;; *) chchch="$chchch $i" ;; esac +done +mergechanges -f $chchch +rm $chchch case $signp in - t) debsign -k"$keyid" "${pkg}_${ver}_"*.changes ;; + t) debsign -k"$keyid" "${pkg}_${ver}_multi.changes" ;; esac -- [mdw]