Merge lp:~jtv/maas-test/pkg-drop-xdg into lp:maas-test

Proposed by Jeroen T. Vermeulen
Status: Superseded
Proposed branch: lp:~jtv/maas-test/pkg-drop-xdg
Merge into: lp:maas-test
Diff against target: 120 lines (+84/-0)
7 files modified
debian/changelog (+7/-0)
debian/compat (+1/-0)
debian/control (+36/-0)
debian/copyright (+25/-0)
debian/maas-test.manpages (+1/-0)
debian/rules (+13/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~jtv/maas-test/pkg-drop-xdg
Reviewer Review Type Date Requested Status
Julian Edwards (community) Needs Resubmitting
Review via email: mp+200955@code.launchpad.net

This proposal has been superseded by a proposal from 2014-01-09.

Commit message

Drop dependency on python-xdg.

Description of the change

We only needed this package to locate ~/.config/maas-test, which we are no longer doing. Nowadays maas-test must always run as root, so the directory will be entirely root-owned, which is awkward when running "sudo" — it keeps the original user's home directory.

The files we used to keep in ~/.config/maas-test are being moved into their appropriate locations in /var and /run. Current trunk no longer uses the home directory at all.

Jeroen

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Wrong merge target

review: Needs Resubmitting

Unmerged revisions

9. By Jeroen T. Vermeulen

No longer need python-xdg.

8. By Raphaël Badin

Add missing dependency: python-xdg.

7. By Raphaël Badin

Add missing dependency: virt-what.

6. By Raphaël Badin

Add missing dependency: polipo.

5. By Raphaël Badin

Add missing dependency. Force version of python-six newer than 1.2.0.

4. By Andres Rodriguez

Revert to rev2

3. By Andres Rodriguez

Test new versioning

2. By Andres Rodriguez

Initial Release

1. By Raphaël Badin

Initial version.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== added file 'debian/changelog'
3--- debian/changelog 1970-01-01 00:00:00 +0000
4+++ debian/changelog 2014-01-09 06:11:03 +0000
5@@ -0,0 +1,7 @@
6+maas-test (0.1+bzr58-0ubuntu1) UNRELEASED; urgency=low
7+
8+ * Initial Release
9+
10+ -- Raphaël Badin <raphael.badin@canonical.com> Fri, 22 Nov 2013 12:07:51 +0100
11+
12+
13
14=== added file 'debian/compat'
15--- debian/compat 1970-01-01 00:00:00 +0000
16+++ debian/compat 2014-01-09 06:11:03 +0000
17@@ -0,0 +1,1 @@
18+7
19
20=== added file 'debian/control'
21--- debian/control 1970-01-01 00:00:00 +0000
22+++ debian/control 2014-01-09 06:11:03 +0000
23@@ -0,0 +1,36 @@
24+Source: maas-test
25+Section: net
26+Priority: optional
27+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
28+XSBC-Original-Maintainer: MAAS Maintainers <maas-devel@lists.launchpad.net>
29+Build-Depends: debhelper (>= 8.1.0~),
30+ po-debconf,
31+ python (>= 2.7),
32+ python-distribute,
33+ python-six
34+Standards-Version: 3.9.4
35+X-Python-Version: >= 2.7
36+Homepage: http://launchpad.net/maas-test
37+
38+Package: maas-test
39+Architecture: all
40+Depends: cpu-checker,
41+ polipo,
42+ python (>= 2.7),
43+ python-distro-info,
44+ python-fixtures,
45+ python-lxml,
46+ python-maas-client,
47+ python-netaddr,
48+ python-netifaces,
49+ python-six (>= 1.2.0),
50+ python-testresources,
51+ python-testtools,
52+ qemu-kvm,
53+ uvtool,
54+ uvtool-libvirt,
55+ virt-what,
56+ ${misc:Depends}
57+Description: Utility to test hardware compatibility with MAAS
58+ Utility to test whether a particular set of hardware is compatible
59+ with MAAS.
60
61=== added file 'debian/copyright'
62--- debian/copyright 1970-01-01 00:00:00 +0000
63+++ debian/copyright 2014-01-09 06:11:03 +0000
64@@ -0,0 +1,25 @@
65+Format: http://dep.debian.net/deps/dep5
66+Upstream-Name: maas-test
67+Source: https://launchpad.net/maas-test
68+
69+Files: *
70+Copyright: 2013 Canonical Ltd.
71+License: AGPL-3.0+
72+
73+Files: debian/*
74+Copyright: 2013 Canonical Ltd.
75+License: AGPL-3.0+
76+
77+License: AGPL-3.0+
78+ This program is free software: you can redistribute it and/or modify
79+ it under the terms of the GNU Affero General Public License as
80+ published by the Free Software Foundation, either version 3 of the
81+ License, or (at your option) any later version.
82+ .
83+ This program is distributed in the hope that it will be useful,
84+ but WITHOUT ANY WARRANTY; without even the implied warranty of
85+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
86+ GNU Affero General Public License for more details.
87+ .
88+ You should have received a copy of the GNU Affero General Public License
89+ along with this program. If not, see <http://www.gnu.org/licenses/>.
90
91=== added file 'debian/maas-test.manpages'
92--- debian/maas-test.manpages 1970-01-01 00:00:00 +0000
93+++ debian/maas-test.manpages 2014-01-09 06:11:03 +0000
94@@ -0,0 +1,1 @@
95+man/maas-test.8
96
97=== added file 'debian/rules'
98--- debian/rules 1970-01-01 00:00:00 +0000
99+++ debian/rules 2014-01-09 06:11:03 +0000
100@@ -0,0 +1,13 @@
101+#!/usr/bin/make -f
102+
103+%:
104+ dh $@ --with python2 --buildsystem=python_distutils
105+
106+DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
107+REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
108+ | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p')
109+VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
110+ | sed -rne 's,^Version: ([^-]+).*,\1,p')
111+get-orig-source:
112+ bzr export -r $(REV) --root=maas-test-$(VER).orig \
113+ maas-test_$(VER).orig.tar.gz lp:maas-test
114
115=== added directory 'debian/source'
116=== added file 'debian/source/format'
117--- debian/source/format 1970-01-01 00:00:00 +0000
118+++ debian/source/format 2014-01-09 06:11:03 +0000
119@@ -0,0 +1,1 @@
120+3.0 (quilt)

Subscribers

People subscribed via source and target branches