Merge lp:~dobey/ubuntuone-dev-tools/add-autopkgtest into lp:ubuntuone-dev-tools/packaging-dailies

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 27
Merged at revision: 26
Proposed branch: lp:~dobey/ubuntuone-dev-tools/add-autopkgtest
Merge into: lp:ubuntuone-dev-tools/packaging-dailies
Diff against target: 73 lines (+24/-14)
3 files modified
control (+3/-2)
rules (+2/-12)
tests/control (+19/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-dev-tools/add-autopkgtest
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Review via email: mp+177930@code.launchpad.net

Commit message

Add autopkgtest config.
Remove support for building on lucid.

To post a comment you must log in.
27. By dobey

Remove support for building on lucid.

Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks good, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2012-10-18 21:44:06 +0000
3+++ control 2013-07-31 19:44:28 +0000
4@@ -3,7 +3,7 @@
5 XSBC-Original-Maintainer: Rodney Dawes <rodney.dawes@ubuntu.com>
6 Section: python
7 Priority: optional
8-Standards-Version: 3.9.3
9+Standards-Version: 3.9.4
10 Build-Depends-Indep:
11 apache2-utils,
12 dbus,
13@@ -21,8 +21,9 @@
14 python-twisted-web,
15 squid3 | squid
16 Build-Depends: debhelper (>= 7.0.50),
17- python-all (>= 2.6.6-3) | python-support
18+ python-all (>= 2.6.6-3)
19 Homepage: http://launchpad.net/ubuntuone-dev-tools
20+XS-Testsuite: autopkgtest
21
22 Package: python-ubuntuone-devtools
23 Architecture: all
24
25=== modified file 'rules'
26--- rules 2012-08-21 15:12:15 +0000
27+++ rules 2013-07-31 19:44:28 +0000
28@@ -1,18 +1,8 @@
29 #!/usr/bin/make -f
30
31-DIST_SERIES=$(shell cat /etc/lsb-release | grep "DISTRIB_CODENAME" | cut -d= -f2)
32-
33 %:
34- if test "$(DIST_SERIES)" = "lucid"; then \
35- dh $@ --fail-missing; \
36- else \
37- dh --with python2 $@ --fail-missing; \
38- fi
39+ dh --with python2 $@ --fail-missing
40
41 override_dh_auto_test:
42- if test "$(DIST_SERIES)" = "lucid"; then \
43- ./run-tests || true; \
44- else \
45- ./run-tests; \
46- fi
47+ ./run-tests
48
49
50=== added directory 'tests'
51=== added file 'tests/control'
52--- tests/control 1970-01-01 00:00:00 +0000
53+++ tests/control 2013-07-31 19:44:28 +0000
54@@ -0,0 +1,19 @@
55+Tests: run-tests
56+Tests-Directory: .
57+Restrictions: rw-build-tree build-needed allow-stderr
58+Depends: @,
59+ apache2-utils,
60+ dbus,
61+ pep8,
62+ pyflakes,
63+ pylint (>= 0.21.0),
64+ python-coverage,
65+ python-dbus,
66+ python-dirspec (>= 3.1),
67+ python-gobject,
68+ python-openssl,
69+ python-qt4,
70+ python-setuptools,
71+ python-twisted-core,
72+ python-twisted-web,
73+ squid3 | squid

Subscribers

People subscribed via source and target branches

to all changes: