Bug#739988: Fix autopkgtest missing dependencies and locale

[Martin Pitt <martin.pitt@ubuntu.com>]

Package: apt
Version: 0.9.15.4
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch trusty
User: autopkgtest-devel@lists.alioth.debian.org
Usertags: autopkgtest

Hello,

Thanks for adding an autopkgtest to apt! However, it currently fails
[1]:

| adt-run: & tree0t-run-tests:  - - - - - - - - - - results - - - - - - - - - -
| tree0t-run-tests     FAIL non-zero exit status 2
| adt-run: & tree0t-run-tests:  - - - - - - - - - - stdout - - - - - - - - - -
| checking build system type... x86_64-unknown-linux-gnu
| checking host system type... x86_64-unknown-linux-gnu
| checking target system type... x86_64-unknown-linux-gnu
| checking for gcc... no
| checking for cc... no
| checking for cl.exe... no
| adt-run: & tree0t-run-tests:  - - - - - - - - - - stderr - - - - - - - - - -
| configure: error: in `/tmp/adt-run.1QqrIC/tree0-tree/build':
| configure: error: no acceptable C compiler found in $PATH

This is easily rectified. Then I get some more errors due to not
having fakeroot and wget installed, and lot of diffs because it
expects English strings. The attached debdiff fixes all those.

The remaining problem is now that all of the webserver-related tests
hang eternally when I run them in LXC. It seems to work in QEMU [2],
but with a lot more packages pre-installed, so it could be that it
does something funky with the network configuration that just doesn't
work in LXC, or that there's another missing dependency.

Thanks for considering,

Martin

[1] http://ci.debian.net/#package/apt
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)

diff -Nru apt-0.9.15.4ubuntu1/debian/changelog apt-0.9.15.4ubuntu2/debian/changelog
--- apt-0.9.15.4ubuntu1/debian/changelog	2014-02-23 00:46:13.000000000 +0100
+++ apt-0.9.15.4ubuntu2/debian/changelog	2014-02-24 18:52:24.000000000 +0100
@@ -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 -Nru apt-0.9.15.4ubuntu1/debian/tests/control apt-0.9.15.4ubuntu2/debian/tests/control
--- apt-0.9.15.4ubuntu1/debian/tests/control	2014-02-23 00:45:07.000000000 +0100
+++ apt-0.9.15.4ubuntu2/debian/tests/control	2014-02-24 18:51:53.000000000 +0100
@@ -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 -Nru apt-0.9.15.4ubuntu1/debian/tests/run-tests apt-0.9.15.4ubuntu2/debian/tests/run-tests
--- apt-0.9.15.4ubuntu1/debian/tests/run-tests	2014-02-13 14:28:27.000000000 +0100
+++ apt-0.9.15.4ubuntu2/debian/tests/run-tests	2014-02-24 18:36:20.000000000 +0100
@@ -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