Ubuntu
python-imaging package

Merge lp:~jibel/ubuntu/trusty/python-imaging/lp1248743_enable_autopkgtest into lp:ubuntu/trusty/python-imaging

  1. Trusty (14.04)
  2. lp1248743_enable_autopkgtest
  3. Merge into trusty
Proposed by Jean-Baptiste Lallement
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~jibel/ubuntu/trusty/python-imaging/lp1248743_enable_autopkgtest
Merge into: lp:ubuntu/trusty/python-imaging
Diff against target: 72 lines (+28/-0)
7 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
debian/tests/control (+5/-0)
debian/tests/selftest-py2 (+4/-0)
debian/tests/selftest-py3 (+4/-0)
debian/tests/upstream-py2 (+4/-0)
debian/tests/upstream-py3 (+4/-0)
To merge this branch: bzr merge lp:~jibel/ubuntu/trusty/python-imaging/lp1248743_enable_autopkgtest
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+194249@code.launchpad.net

Description of the change

* Enable support for autopkgtest (LP: 1248743)

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Uploaded. Please forward to Debian, too.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-22 14:35:06 +0000
3+++ debian/changelog 2013-11-06 22:15:37 +0000
4@@ -1,3 +1,9 @@
5+python-imaging (1.1.7+2.0.0-1ubuntu2) trusty; urgency=low
6+
7+ * Enable autopkgtest (LP: #1248743)
8+
9+ -- Jean-Baptiste Lallement <jean-baptiste.lallement@canonical.com> Wed, 06 Nov 2013 23:03:19 +0100
10+
11 python-imaging (1.1.7+2.0.0-1ubuntu1) saucy; urgency=low
12
13 * Add PngImagePlugin.py to PILcompat directory. (LP: #1173704)
14
15=== modified file 'debian/control'
16--- debian/control 2013-05-22 14:35:06 +0000
17+++ debian/control 2013-11-06 22:15:37 +0000
18@@ -10,6 +10,7 @@
19 libsane-dev, libfreetype6-dev, libjpeg8-dev, zlib1g-dev, liblcms1-dev,
20 Build-Conflicts: python-numarray
21 Standards-Version: 3.9.4
22+XS-Testsuite: autopkgtest
23
24 Package: python-imaging
25 Architecture: any
26
27=== added directory 'debian/tests'
28=== added file 'debian/tests/control'
29--- debian/tests/control 1970-01-01 00:00:00 +0000
30+++ debian/tests/control 2013-11-06 22:15:37 +0000
31@@ -0,0 +1,5 @@
32+Tests: selftest-py2 selftest-py3
33+Depends: @
34+
35+Tests: upstream-py2 upstream-py3
36+Depends: @
37
38=== added file 'debian/tests/selftest-py2'
39--- debian/tests/selftest-py2 1970-01-01 00:00:00 +0000
40+++ debian/tests/selftest-py2 2013-11-06 22:15:37 +0000
41@@ -0,0 +1,4 @@
42+#!/bin/sh
43+set -e
44+
45+python selftest.py
46
47=== added file 'debian/tests/selftest-py3'
48--- debian/tests/selftest-py3 1970-01-01 00:00:00 +0000
49+++ debian/tests/selftest-py3 2013-11-06 22:15:37 +0000
50@@ -0,0 +1,4 @@
51+#!/bin/sh
52+set -e
53+
54+python3 selftest.py
55
56=== added file 'debian/tests/upstream-py2'
57--- debian/tests/upstream-py2 1970-01-01 00:00:00 +0000
58+++ debian/tests/upstream-py2 2013-11-06 22:15:37 +0000
59@@ -0,0 +1,4 @@
60+#!/bin/sh
61+set -e
62+
63+python Tests/run.py --installed
64
65=== added file 'debian/tests/upstream-py3'
66--- debian/tests/upstream-py3 1970-01-01 00:00:00 +0000
67+++ debian/tests/upstream-py3 2013-11-06 22:15:37 +0000
68@@ -0,0 +1,4 @@
69+#!/bin/sh
70+set -e
71+
72+python3 Tests/run.py --installed

Subscribers

People subscribed via source and target branches