]> 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:

projects / code / mbuild.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0a2c410)
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 patch | blob | history

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 02edbc293bed06accb081627d24bf47badc1624a..a2e6194bcb1f69a554f66863593e0488f2495b1b 100755 (executable)
--- 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
 
wed sbuild and reprepro

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.