determine default dist from changes file

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 243587d8f2bd24304c8748eced9135837644a29f..02edbc293bed06accb081627d24bf47badc1624a 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -54,7 +54,7 @@ usage()
   echo
   echo "Valid options are:"
   cat <<-_eof | column -s\& -t
   echo
   echo "Valid options are:"
   cat <<-_eof | column -s\& -t

-       --dist & specify the target distribution (default: sid)
+       --dist & specify the target distribution (default: from changes file)

        --arch & specify the target architecture (default: $DEB_BUILD_ARCH)
        -sa & pass --force-orig-source to sbuild
        -B & do a binary-only build
        --arch & specify the target architecture (default: $DEB_BUILD_ARCH)
        -sa & pass --force-orig-source to sbuild
        -B & do a binary-only build


@@ -67,13 +67,11 @@ binonly=0
 sbuild_args=
 schangesfile=
 arch=
 sbuild_args=
 schangesfile=
 arch=

-dist=

 for opt in "$@"; do
   case "$opt" in
     -h|--help) usage; exit 0;;
     -V|--version) about; exit 0;;
     --arch=*) arch="${opt#--arch=}";;
 for opt in "$@"; do
   case "$opt" in
     -h|--help) usage; exit 0;;
     -V|--version) about; exit 0;;
     --arch=*) arch="${opt#--arch=}";;

-    --dist=*) dist="${opt#--dist=}";;

     -sa) sbuild_args="${sbuild_args:+$sbuild_args }--force-orig-source";;
     -B) binonly=1;;
     --*) 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";;


@@ -103,7 +101,8 @@ if [ -z "$schangesfile" ]; then
 fi
 
 [ -z "$arch" ] && arch="$DEB_BUILD_ARCH"
 fi
 
 [ -z "$arch" ] && arch="$DEB_BUILD_ARCH"

-[ -z "$dist" ] && dist="unstable"
+
+dist="$(sed -ne 's,Distribution: ,,p' "$schangesfile")"

 
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
 
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"