Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	debian/changelog

4 files changed, 17 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 31e0fe5f3..246102a02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.13.1~ubuntu2) UNRELEASED; urgency=low
+
+  * add autopkgtest support for the integration testsuite
+  * merge mvo/feature/edit-sources  
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Nov 2013 14:37:36 +0100
+
 apt (0.9.13.1~ubuntu1) trusty; urgency=low
 
   [ Colin Watson ]
diff --git a/debian/control b/debian/control
index fef346843..9b5e4ced2 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends-Indep: doxygen, debiandoc-sgml
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Git: git://anonscm.debian.org/apt/apt.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git
+XS-Testsuite: autopkgtest
 
 Package: apt
 Architecture: any
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 000000000..e38921c7e
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: run-tests
+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
\ No newline at end of file
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
new file mode 100644
index 000000000..6ea503568
--- /dev/null
+++ b/debian/tests/run-tests
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+make
+make test
+test/integration/run-tests