merge upload 0.9.15.4ubuntu20.9.15.4ubuntu2

3 files changed, 13 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 162749a25..1f8ac7e2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.9.15.4ubuntu2) trusty; urgency=medium
+
+  * debian/tests/control: Add missing build-essential, fakeroot, and wget test
+    dependencies.
+  * debian/tests/run-tests: Pin locale to C to avoid test failures in other
+    locales.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 24 Feb 2014 18:26:13 +0100
+
 apt (0.9.15.4ubuntu1) trusty; urgency=low
 
   * merge with debian/sid
diff --git a/debian/tests/control b/debian/tests/control
index 12490a36f..209f16bfd 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-tests
 Restrictions: allow-stderr 
-Depends: @, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev
+Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index d9a9db7bf..6dc4eaa93 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,6 +2,9 @@
 
 set -e
 
+unset LANGUAGE
+export LC_ALL=C
+
 # we need the buildin webserver for the tests
 if [ ! -e environment.mak ]; then
     make startup