From: martin f. krafft Date: Fri, 15 May 2009 09:14:51 +0000 (+0200) Subject: properly merge source and binary changes files X-Git-Url: https://git.madduck.net/code/mbuild.git/commitdiff_plain/8627b08d117390d4b84d1aef3e1398188857d5f3?ds=sidebyside properly merge source and binary changes files --- diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index 02edbc2..a2e6194 100755 --- a/sbuild-wrapper.sh +++ b/sbuild-wrapper.sh @@ -123,9 +123,9 @@ sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \ changesfile="${packagenameversion}_${arch}.changes" -mv "$changesfile" "${changesfile}.binonly" -mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile" -rm "${changesfile}.binonly" "$schangesfile" +mergechanges "$schangesfile" "$changesfile" > temp-combined.changes +mv temp-combined.changes "$changesfile" +changestool "$changesfile" updatechecksums #TODO sign here