merged from donkult and fix dashish

diff --cc debian/changelog
index 58e2c7e6d315228740158d0342415548042f3747,b34a18f8553f5e2e3fadb31e2b41b2afe3269fa4..f9f8c506429ccbe0653fcfc1e6478b7504f364f5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,8 -3,10 +3,14 @@@ apt (0.8.11.4) UNRELEASED; urgency=lo
    [ David Kalnischkies ]
    * apt-pkg/contrib/error.cc:
      - ensure that va_list is not invalid in second try
+   * cmdline/apt-get.cc:
+     - don't remove new dependencies of garbage packages (Closes: #613420)
++  
++  [ Michael Vogt ]
++  * test/integration/*
++    - fix dashish in the integration tests
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 15 Feb 2011 13:09:57 +0100
 - -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 15 Feb 2011 20:45:54 +0100
++ -- Michael Vogt <mvo@debian.org>  Wed, 16 Feb 2011 14:36:03 +0100
  
  apt (0.8.11.3) unstable; urgency=low
  

diff --cc test/libapt/run-tests
index a66de386d1cce88ef8d1eee2f35b2013ee76192f,a66de386d1cce88ef8d1eee2f35b2013ee76192f..4b71c2097a939119269a03f756dfa6a53f88f6af
--- 1/test/libapt/run-tests
--- 2/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  set -e
  
--local DIR=$(readlink -f $(dirname $0))
++DIR=$(readlink -f $(dirname $0))
  echo "Compiling the tests …"
  test -d "$DIR/../../build/obj/test/libapt/" || mkdir -p "$DIR/../../build/obj/test/libapt/"
  (cd $DIR && make)