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
=== modified file 'control'
--- control 2012-10-18 21:44:06 +0000
+++ control 2013-07-31 19:44:28 +0000
@@ -3,7 +3,7 @@
3XSBC-Original-Maintainer: Rodney Dawes <rodney.dawes@ubuntu.com>3XSBC-Original-Maintainer: Rodney Dawes <rodney.dawes@ubuntu.com>
4Section: python4Section: python
5Priority: optional5Priority: optional
6Standards-Version: 3.9.36Standards-Version: 3.9.4
7Build-Depends-Indep:7Build-Depends-Indep:
8 apache2-utils,8 apache2-utils,
9 dbus,9 dbus,
@@ -21,8 +21,9 @@
21 python-twisted-web,21 python-twisted-web,
22 squid3 | squid22 squid3 | squid
23Build-Depends: debhelper (>= 7.0.50),23Build-Depends: debhelper (>= 7.0.50),
24 python-all (>= 2.6.6-3) | python-support24 python-all (>= 2.6.6-3)
25Homepage: http://launchpad.net/ubuntuone-dev-tools25Homepage: http://launchpad.net/ubuntuone-dev-tools
26XS-Testsuite: autopkgtest
2627
27Package: python-ubuntuone-devtools28Package: python-ubuntuone-devtools
28Architecture: all29Architecture: all
2930
=== modified file 'rules'
--- rules 2012-08-21 15:12:15 +0000
+++ rules 2013-07-31 19:44:28 +0000
@@ -1,18 +1,8 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3DIST_SERIES=$(shell cat /etc/lsb-release | grep "DISTRIB_CODENAME" | cut -d= -f2)
4
5%:3%:
6 if test "$(DIST_SERIES)" = "lucid"; then \4 dh --with python2 $@ --fail-missing
7 dh $@ --fail-missing; \
8 else \
9 dh --with python2 $@ --fail-missing; \
10 fi
115
12override_dh_auto_test:6override_dh_auto_test:
13 if test "$(DIST_SERIES)" = "lucid"; then \7 ./run-tests
14 ./run-tests || true; \
15 else \
16 ./run-tests; \
17 fi
188
199
=== added directory 'tests'
=== added file 'tests/control'
--- tests/control 1970-01-01 00:00:00 +0000
+++ tests/control 2013-07-31 19:44:28 +0000
@@ -0,0 +1,19 @@
1Tests: run-tests
2Tests-Directory: .
3Restrictions: rw-build-tree build-needed allow-stderr
4Depends: @,
5 apache2-utils,
6 dbus,
7 pep8,
8 pyflakes,
9 pylint (>= 0.21.0),
10 python-coverage,
11 python-dbus,
12 python-dirspec (>= 3.1),
13 python-gobject,
14 python-openssl,
15 python-qt4,
16 python-setuptools,
17 python-twisted-core,
18 python-twisted-web,
19 squid3 | squid

Subscribers

People subscribed via source and target branches

to all changes: