]> 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: f2bba28)
no longer necessary to merge changes
authormartin f. krafft <madduck@madduck.net>
Tue, 21 Jul 2009 12:21:56 +0000 (14:21 +0200)
committermartin f. krafft <madduck@madduck.net>
Tue, 21 Jul 2009 12:21:56 +0000 (14:21 +0200)
Signed-off-by: martin f. krafft <madduck@madduck.net>
sbuild-wrapper.sh patch | blob | history

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 9fef3dde4f4bc3a96e4daaee85034774992b0310..ead8053c19e413d41b39fab7b512725d20dc83fc 100755 (executable)
--- 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"
 
 
 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"
 
 
 #sign_changes_file "$changesfile"
 
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.