X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/f2bba282bd0fee1dd4c0444bf870b4801ae41f40..043daa5db9c741c54c242d1c2fa2cfff820ff4a4:/sbuild-wrapper.sh?ds=sidebyside

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 9fef3dd..c410dcb 100755
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -72,6 +72,7 @@ for opt in "$@"; do
     -h|--help) usage; exit 0;;
     -V|--version) about; exit 0;;
     --arch=*) arch="${opt#--arch=}";;
+    -D) sbuild_args="${sbuild_args:+$sbuild_args }$opt";;
     -sa) sbuild_args="${sbuild_args:+$sbuild_args }--force-orig-source";;
     -B) binonly=1;;
     --*) sbuild_args="${sbuild_args:+$sbuild_args }$opt";;
@@ -124,8 +125,8 @@ dcmd "$dscfile_basename" | while read f; do
   test -f "$f" && continue
 
   case "$f" in
-    *.tar.gz)
-      last_version="$(apt-cache madison mdadm | sed -rne "s,.+(\<${upstream_version}[^[:space:]]+).*,\1,p")"
+    *.tar.gz|*.tar.bz2|*.tar.lzma|*.tar.xz)
+      last_version="$(apt-cache madison $packagename | sed -rne "s,.+(\<${upstream_version}[^[:space:]]+).*,\1,p")"
       echo "I: fetching missing tarball for $upstream_version (from $last_version)…" >&2
       apt-get --tar-only --only-source source "${packagename}=${last_version}"
       ;;
@@ -143,9 +144,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"