Merge lp:~roadmr/checkbox/ppa-packaging-plainbox-provider-canonical-certification-update-config-file-environment-case into lp:checkbox

Proposed by Daniel Manrique on 2014-03-28
Status: Superseded
Proposed branch: lp:~roadmr/checkbox/ppa-packaging-plainbox-provider-canonical-certification-update-config-file-environment-case
Merge into: lp:checkbox
Diff against target: 219 lines (+166/-0)
10 files modified
debian/changelog (+7/-0)
debian/compat (+1/-0)
debian/control (+78/-0)
debian/copyright (+33/-0)
debian/extras/canonical-certification-config/canonical-certification.conf (+20/-0)
debian/plainbox-provider-certification-client.install (+2/-0)
debian/plainbox-provider-certification-server-soc.install (+2/-0)
debian/plainbox-provider-certification-server.install (+3/-0)
debian/rules (+19/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~roadmr/checkbox/ppa-packaging-plainbox-provider-canonical-certification-update-config-file-environment-case
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) 2014-03-28 Needs Fixing on 2014-03-28
Review via email: mp+213271@code.launchpad.net

This proposal has been superseded by a proposal from 2014-03-28.

Commit message

Correct case of sample environment variables in config file, to avoid confusion

Description of the change

Correct case of sample environment variables in config file, to avoid confusion

To post a comment you must log in.
Zygmunt Krynicki (zyga) wrote :

Target branch is wrong

review: Needs Fixing

Unmerged revisions

3. By Daniel Manrique on 2014-03-28

Correct case of sample environment variables in config file, to avoid confusion

2. By Zygmunt Krynicki on 2014-03-27

ship canonical-certification.conf in the
plainbox-provider-certification-server package

1. By Zygmunt Krynicki on 2014-03-27

Initial import

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-03-28 14:20:51 +0000
5@@ -0,0 +1,7 @@
6+plainbox-provider-canonical-certification (0.1~dev) UNRELEASED; urgency=medium
7+
8+ * fork from the monolithic packaging we used to have
9+ * ship canonical-certification.conf in the
10+ plainbox-provider-certification-server package
11+
12+ -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Thu, 27 Mar 2014 13:41:47 +0100
13
14=== added file 'debian/compat'
15--- debian/compat 1970-01-01 00:00:00 +0000
16+++ debian/compat 2014-03-28 14:20:51 +0000
17@@ -0,0 +1,1 @@
18+9
19
20=== added file 'debian/control'
21--- debian/control 1970-01-01 00:00:00 +0000
22+++ debian/control 2014-03-28 14:20:51 +0000
23@@ -0,0 +1,78 @@
24+Source: plainbox-provider-canonical-certification
25+Section: utils
26+Priority: optional
27+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
28+Standards-Version: 3.9.3
29+Build-Depends:
30+ debhelper (>= 9.2),
31+ python,
32+ python-distutils-extra,
33+ python-setuptools,
34+ python3-all (>= 3.2),
35+ python3-distutils-extra,
36+ python3-pkg-resources,
37+ python3-setuptools,
38+Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/ppa-packaging-plainbox-provider-canonical-certification
39+
40+Package: plainbox-provider-certification-client
41+Architecture: all
42+Depends: plainbox-provider-checkbox
43+Recommends:
44+ curl,
45+ fswebcam,
46+ gtkperf,
47+ imagemagick,
48+ obexftp
49+Description: Client Certification
50+ This package provides the Client Certification whitelists.
51+
52+Package: plainbox-provider-certification-server
53+Architecture: all
54+Depends: plainbox-provider-checkbox
55+Recommends:
56+ apache2,
57+ bind9,
58+ bonnie++,
59+ cpu-checker,
60+ cups,
61+ dnsutils,
62+ fwts (>=13.09.00-0ubuntu1),
63+ iperf,
64+ ipmitool,
65+ libapache2-mod-php5,
66+ mysql-server,
67+ nmap,
68+ php5-mysql,
69+ qemu-kvm,
70+ qemu-utils,
71+ samba,
72+ ssh,
73+ stress,
74+ tomcat6,
75+ winbind,
76+Description: Server Certification
77+ This package provides the Server Certification whitelists.
78+
79+Package: plainbox-provider-certification-server-soc
80+Architecture: all
81+Depends: plainbox-provider-checkbox
82+Recommends:
83+ apache2,
84+ bind9,
85+ cpu-checker,
86+ cups,
87+ dnsutils,
88+ iperf,
89+ ipmitool,
90+ libapache2-mod-php5,
91+ mysql-server,
92+ php5-mysql,
93+ qemu-kvm,
94+ qemu-utils,
95+ samba,
96+ ssh,
97+ tomcat6,
98+ winbind
99+Description: SoC Certification
100+ This package provides the Server SoC Certification whitelists.
101+
102
103=== added file 'debian/copyright'
104--- debian/copyright 1970-01-01 00:00:00 +0000
105+++ debian/copyright 2014-03-28 14:20:51 +0000
106@@ -0,0 +1,33 @@
107+This package was debianized by Marc Tardif <marc.tardif@canonical.com> Mon,
108+17 Sep 2007 17:25:54 -0300.
109+
110+It was downloaded from http://launchpad.net/checkbox
111+
112+Upstream Authors:
113+ Marc Tardif <marc.tardif@canonical.com>
114+ Christian Reis <christian.reis@canonical.com>
115+ David Murphy <david.murphy@canonical.com>
116+ Martin Pitt <martin.pitt@ubuntu.com>
117+ Gustavo Niemeyer <gustavo@niemeyer.net>
118+
119+Copyright:
120+ Copyright 2008 Canonical Ltd.
121+ Copyright 2006 Gustavo Niemeyer
122+
123+License:
124+
125+ This package is free software: you can redistribute it and/or modify
126+ it under the terms of the GNU General Public License as published by
127+ the Free Software Foundation, either version 3 of the License, or
128+ (at your option) any later version.
129+
130+ This program is distributed in the hope that it will be useful,
131+ but WITHOUT ANY WARRANTY; without even the implied warranty of
132+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
133+ GNU General Public License for more details.
134+
135+ You should have received a copy of the GNU General Public License
136+ along with this program. If not, see <http://www.gnu.org/licenses/>.
137+
138+On Debian systems, the complete text of the GNU General
139+Public License can be found in `/usr/share/common-licenses/GPL'.
140
141=== added directory 'debian/extras'
142=== added directory 'debian/extras/canonical-certification-config'
143=== added file 'debian/extras/canonical-certification-config/canonical-certification.conf'
144--- debian/extras/canonical-certification-config/canonical-certification.conf 1970-01-01 00:00:00 +0000
145+++ debian/extras/canonical-certification-config/canonical-certification.conf 2014-03-28 14:20:51 +0000
146@@ -0,0 +1,20 @@
147+[common]
148+welcome_text = Welcome to System Certification!
149+
150+ This application will gather information from your system. Then you will be asked manual tests to confirm that the system is working properly. Finally, you will be asked for the Secure ID of the computer to submit the information to the certification.canonical.com database.
151+
152+ To learn how to create or locate the Secure ID, please see here:
153+
154+ https://certification.canonical.com/home/ubuntu-certified
155+
156+[environment]
157+# For virtualization testing.
158+# Uncomment the following 2 lines and set the proper parameters:
159+#KVM_TIMEOUT =
160+#KVM_IMAGE =
161+# For network testing.
162+# Uncomment the following 4 lines and set the proper parameters:
163+#TEST_TARGET_FTP = your-ftp-server.example.com
164+#TEST_USER = anonymous
165+#TEST_PASS =
166+#TEST_TARGET_IPERF = your-iperf-server.example.com
167
168=== added file 'debian/plainbox-provider-certification-client.install'
169--- debian/plainbox-provider-certification-client.install 1970-01-01 00:00:00 +0000
170+++ debian/plainbox-provider-certification-client.install 2014-03-28 14:20:51 +0000
171@@ -0,0 +1,2 @@
172+usr/lib/plainbox-providers-1/certification-client
173+usr/share/plainbox-providers-1/certification-client.provider
174
175=== added file 'debian/plainbox-provider-certification-server-soc.install'
176--- debian/plainbox-provider-certification-server-soc.install 1970-01-01 00:00:00 +0000
177+++ debian/plainbox-provider-certification-server-soc.install 2014-03-28 14:20:51 +0000
178@@ -0,0 +1,2 @@
179+usr/lib/plainbox-providers-1/certification-server-soc
180+usr/share/plainbox-providers-1/certification-server-soc.provider
181
182=== added file 'debian/plainbox-provider-certification-server.install'
183--- debian/plainbox-provider-certification-server.install 1970-01-01 00:00:00 +0000
184+++ debian/plainbox-provider-certification-server.install 2014-03-28 14:20:51 +0000
185@@ -0,0 +1,3 @@
186+usr/lib/plainbox-providers-1/certification-server
187+usr/share/plainbox-providers-1/certification-server.provider
188+debian/extras/canonical-certification-config/canonical-certification.conf /etc/xdg
189
190=== added file 'debian/rules'
191--- debian/rules 1970-01-01 00:00:00 +0000
192+++ debian/rules 2014-03-28 14:20:51 +0000
193@@ -0,0 +1,19 @@
194+#!/usr/bin/make -f
195+#export DH_VERBOSE=1
196+
197+providers=plainbox-provider-certification-client \
198+ plainbox-provider-certification-server \
199+ plainbox-provider-certification-server-soc
200+
201+%:
202+ dh "$@"
203+
204+override_dh_auto_clean:
205+ rm -rf $(foreach provider,$(providers),$(CURDIR)/$(provider)/*.egg-info)
206+
207+override_dh_auto_build:
208+ $(foreach provider,$(providers),cd $(CURDIR)/$(provider) && python3 setup.py build;)
209+
210+override_dh_auto_install:
211+ $(foreach provider,$(providers),cd $(CURDIR)/$(provider) && python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb;)
212+ dh_install
213
214=== added directory 'debian/source'
215=== added file 'debian/source/format'
216--- debian/source/format 1970-01-01 00:00:00 +0000
217+++ debian/source/format 2014-03-28 14:20:51 +0000
218@@ -0,0 +1,1 @@
219+3.0 (native)

Subscribers

People subscribed via source and target branches