Merge remote-tracking branch 'mvo/debian/sid' into debian/experimental-no-abi-break

diff --combined test/integration/framework
index 2fe059280f3b0baf4ef7948364ddb5ae3bfad25d,6620c78dde2259bc151969bd8111432f996a78b2..ca2f9005054d7b4d890a2a4cb654ad406c63d76f
--- 1/test/integration/framework
--- 2/test/integration/framework
+++ b/test/integration/framework
@@@ -99,6 -99,7 +99,7 @@@ aptconfig() { runapt apt-config $*; 
  aptcache() { runapt apt-cache $*; }
  aptcdrom() { runapt apt-cdrom $*; }
  aptget() { runapt apt-get $*; }
+ apt() { runapt apt $*; }
  aptftparchive() { runapt apt-ftparchive $*; }
  aptkey() { runapt apt-key $*; }
  aptmark() { runapt apt-mark $*; }
@@@ -202,6 -203,7 +203,7 @@@ setupenvironment() 
        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
        echo 'quiet::NoUpdate "true";' >> aptconfig.conf
        echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https
+         echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary
        export LC_ALL=C
        export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
        configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
@@@ -288,7 -290,7 +290,7 @@@ setupsimplenativepackage() 
        local VERSION="$3"
        local RELEASE="${4:-unstable}"
        local DEPENDENCIES="$5"
-       local DESCRIPTION="${6:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
+       local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
   If you find such a package installed on your system,
   something went horribly wrong! They are autogenerated
   und used only by testcases and surf no other propose…"}"
@@@ -338,7 -340,7 +340,7 @@@ buildsimplenativepackage() 
        local VERSION="$3"
        local RELEASE="${4:-unstable}"
        local DEPENDENCIES="$5"
-       local DESCRIPTION="${6:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
+       local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
   If you find such a package installed on your system,
   something went horribly wrong! They are autogenerated
   und used only by testcases and surf no other propose…"}"
@@@ -535,7 -537,7 +537,7 @@@ insertpackage() 
        local VERSION="$4"
        local DEPENDENCIES="$5"
        local PRIORITY="${6:-optional}"
-       local DESCRIPTION="${7:-"Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
+       local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
   If you find such a package installed on your system,
   something went horribly wrong! They are autogenerated
   und used only by testcases and surf no other propose…"}"
@@@ -595,7 -597,7 +597,7 @@@ insertinstalledpackage() 
        local DEPENDENCIES="$4"
        local PRIORITY="${5:-optional}"
        local STATUS="${6:-install ok installed}"
-       local DESCRIPTION="${7:-"Description: an autogenerated dummy ${NAME}=${VERSION}/installed
+       local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/installed
   If you find such a package installed on your system,
   something went horribly wrong! They are autogenerated
   und used only by testcases and surf no other propose…"}"
@@@ -949,20 -951,11 +951,20 @@@ testempty() 
  }
  
  testequal() {
 +      local MSG='Test of equality of'
 +      if [ "$1" = '--nomsg' ]; then
 +              MSG=''
 +              shift
 +      fi
 +
        local COMPAREFILE=$(mktemp)
        addtrap "rm $COMPAREFILE;"
        echo "$1" > $COMPAREFILE
        shift
 -      msgtest "Test for equality of" "$*"
 +
 +      if [ -n "$MSG" ]; then
 +              msgtest "$MSG" "$*"
 +      fi
        $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
  }