merged from donkult and fix dashish

diff --git a/debian/changelog b/debian/changelog
index b34a18f8553f5e2e3fadb31e2b41b2afe3269fa4..f9f8c506429ccbe0653fcfc1e6478b7504f364f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ apt (0.8.11.4) UNRELEASED; urgency=low
     - 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 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 --git a/test/libapt/run-tests b/test/libapt/run-tests
index a66de386d1cce88ef8d1eee2f35b2013ee76192f..4b71c2097a939119269a03f756dfa6a53f88f6af 100755 (executable)
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -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)