Merge lp:~jibel/ubuntu/trusty/simplejson/enable_autopkgtest into lp:ubuntu/trusty/simplejson

[Jean-Baptiste Lallement]

Enable autopkgtest that runs the upstream test suite against the installed
package.

[Martin Pitt (pitti)]

LGTM, thanks! Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-15 11:44:48 +0000
+++ debian/changelog	2013-11-15 13:01:58 +0000
@@ -1,3 +1,10 @@
+simplejson (3.3.1-1ubuntu4) UNRELEASED; urgency=low
+
+  * Enable autopkgtest that runs the upstream test suite against the installed
+    package.
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Fri, 15 Nov 2013 12:38:07 +0100
+
 simplejson (3.3.1-1ubuntu3) trusty; urgency=low
 
   * debian/rules:
 
=== modified file 'debian/control'
--- debian/control	2013-11-14 10:57:12 +0000
+++ debian/control	2013-11-15 13:01:58 +0000
@@ -13,6 +13,7 @@
 X-Python3-Version: >= 3.2
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/simplejson/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/simplejson/trunk/
+XS-Testsuite: autopkgtest
 
 Package: python-simplejson
 Architecture: any
 
=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-11-15 13:01:58 +0000
@@ -0,0 +1,5 @@
+Tests: upstream
+Depends: @, python-pytest
+
+Tests: upstream-3
+Depends: @, python3-pytest
 
=== added file 'debian/tests/upstream'
--- debian/tests/upstream	1970-01-01 00:00:00 +0000
+++ debian/tests/upstream	2013-11-15 13:01:58 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+py.test  -vs simplejson
 
=== added file 'debian/tests/upstream-3'
--- debian/tests/upstream-3	1970-01-01 00:00:00 +0000
+++ debian/tests/upstream-3	2013-11-15 13:01:58 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+py.test-3  -vs simplejson