]> git.madduck.net Git - code/mbuild.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

properly merge source and binary changes files
authormartin f. krafft <madduck@madduck.net>
Fri, 15 May 2009 09:14:51 +0000 (11:14 +0200)
committermartin f. krafft <madduck@madduck.net>
Fri, 15 May 2009 09:14:51 +0000 (11:14 +0200)
sbuild-wrapper.sh

index 02edbc293bed06accb081627d24bf47badc1624a..a2e6194bcb1f69a554f66863593e0488f2495b1b 100755 (executable)
@@ -123,9 +123,9 @@ sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
 
 changesfile="${packagenameversion}_${arch}.changes"
 
 
 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
 
 
 #TODO sign here