From: martin f. krafft <madduck@madduck.net>
Date: Tue, 21 Jul 2009 12:21:56 +0000 (+0200)
Subject: no longer necessary to merge changes
X-Git-Url: https://git.madduck.net/code/mbuild.git/commitdiff_plain/e032002aa15553fee31692a5166d47e2537b54b6?ds=inline;hp=f2bba282bd0fee1dd4c0444bf870b4801ae41f40

no longer necessary to merge changes

Signed-off-by: martin f. krafft <madduck@madduck.net>
---

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 9fef3dd..ead8053 100755
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -143,9 +143,9 @@ sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
 
 changesfile="${packagenameversion}_${arch}.changes"
 
-mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
-mv temp-combined.changes "$changesfile"
-changestool "$changesfile" updatechecksums
+#mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
+#mv temp-combined.changes "$changesfile"
+#changestool "$changesfile" updatechecksums
 
 #sign_changes_file "$changesfile"