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

Proposed by Daniel Manrique
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) Needs Fixing
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.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Target branch is wrong

review: Needs Fixing

Unmerged revisions

3. By Daniel Manrique

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

2. By Zygmunt Krynicki

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

1. By Zygmunt Krynicki

Initial import

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2014-03-28 14:20:51 +0000
@@ -0,0 +1,7 @@
1plainbox-provider-canonical-certification (0.1~dev) UNRELEASED; urgency=medium
2
3 * fork from the monolithic packaging we used to have
4 * ship canonical-certification.conf in the
5 plainbox-provider-certification-server package
6
7 -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Thu, 27 Mar 2014 13:41:47 +0100
08
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2014-03-28 14:20:51 +0000
@@ -0,0 +1,1 @@
19
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2014-03-28 14:20:51 +0000
@@ -0,0 +1,78 @@
1Source: plainbox-provider-canonical-certification
2Section: utils
3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Standards-Version: 3.9.3
6Build-Depends:
7 debhelper (>= 9.2),
8 python,
9 python-distutils-extra,
10 python-setuptools,
11 python3-all (>= 3.2),
12 python3-distutils-extra,
13 python3-pkg-resources,
14 python3-setuptools,
15Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/ppa-packaging-plainbox-provider-canonical-certification
16
17Package: plainbox-provider-certification-client
18Architecture: all
19Depends: plainbox-provider-checkbox
20Recommends:
21 curl,
22 fswebcam,
23 gtkperf,
24 imagemagick,
25 obexftp
26Description: Client Certification
27 This package provides the Client Certification whitelists.
28
29Package: plainbox-provider-certification-server
30Architecture: all
31Depends: plainbox-provider-checkbox
32Recommends:
33 apache2,
34 bind9,
35 bonnie++,
36 cpu-checker,
37 cups,
38 dnsutils,
39 fwts (>=13.09.00-0ubuntu1),
40 iperf,
41 ipmitool,
42 libapache2-mod-php5,
43 mysql-server,
44 nmap,
45 php5-mysql,
46 qemu-kvm,
47 qemu-utils,
48 samba,
49 ssh,
50 stress,
51 tomcat6,
52 winbind,
53Description: Server Certification
54 This package provides the Server Certification whitelists.
55
56Package: plainbox-provider-certification-server-soc
57Architecture: all
58Depends: plainbox-provider-checkbox
59Recommends:
60 apache2,
61 bind9,
62 cpu-checker,
63 cups,
64 dnsutils,
65 iperf,
66 ipmitool,
67 libapache2-mod-php5,
68 mysql-server,
69 php5-mysql,
70 qemu-kvm,
71 qemu-utils,
72 samba,
73 ssh,
74 tomcat6,
75 winbind
76Description: SoC Certification
77 This package provides the Server SoC Certification whitelists.
78
079
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2014-03-28 14:20:51 +0000
@@ -0,0 +1,33 @@
1This package was debianized by Marc Tardif <marc.tardif@canonical.com> Mon,
217 Sep 2007 17:25:54 -0300.
3
4It was downloaded from http://launchpad.net/checkbox
5
6Upstream Authors:
7 Marc Tardif <marc.tardif@canonical.com>
8 Christian Reis <christian.reis@canonical.com>
9 David Murphy <david.murphy@canonical.com>
10 Martin Pitt <martin.pitt@ubuntu.com>
11 Gustavo Niemeyer <gustavo@niemeyer.net>
12
13Copyright:
14 Copyright 2008 Canonical Ltd.
15 Copyright 2006 Gustavo Niemeyer
16
17License:
18
19 This package is free software: you can redistribute it and/or modify
20 it under the terms of the GNU General Public License as published by
21 the Free Software Foundation, either version 3 of the License, or
22 (at your option) any later version.
23
24 This program is distributed in the hope that it will be useful,
25 but WITHOUT ANY WARRANTY; without even the implied warranty of
26 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27 GNU General Public License for more details.
28
29 You should have received a copy of the GNU General Public License
30 along with this program. If not, see <http://www.gnu.org/licenses/>.
31
32On Debian systems, the complete text of the GNU General
33Public License can be found in `/usr/share/common-licenses/GPL'.
034
=== added directory 'debian/extras'
=== added directory 'debian/extras/canonical-certification-config'
=== added file 'debian/extras/canonical-certification-config/canonical-certification.conf'
--- debian/extras/canonical-certification-config/canonical-certification.conf 1970-01-01 00:00:00 +0000
+++ debian/extras/canonical-certification-config/canonical-certification.conf 2014-03-28 14:20:51 +0000
@@ -0,0 +1,20 @@
1[common]
2welcome_text = Welcome to System Certification!
3
4 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.
5
6 To learn how to create or locate the Secure ID, please see here:
7
8 https://certification.canonical.com/home/ubuntu-certified
9
10[environment]
11# For virtualization testing.
12# Uncomment the following 2 lines and set the proper parameters:
13#KVM_TIMEOUT =
14#KVM_IMAGE =
15# For network testing.
16# Uncomment the following 4 lines and set the proper parameters:
17#TEST_TARGET_FTP = your-ftp-server.example.com
18#TEST_USER = anonymous
19#TEST_PASS =
20#TEST_TARGET_IPERF = your-iperf-server.example.com
021
=== added file 'debian/plainbox-provider-certification-client.install'
--- debian/plainbox-provider-certification-client.install 1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-certification-client.install 2014-03-28 14:20:51 +0000
@@ -0,0 +1,2 @@
1usr/lib/plainbox-providers-1/certification-client
2usr/share/plainbox-providers-1/certification-client.provider
03
=== added file 'debian/plainbox-provider-certification-server-soc.install'
--- debian/plainbox-provider-certification-server-soc.install 1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-certification-server-soc.install 2014-03-28 14:20:51 +0000
@@ -0,0 +1,2 @@
1usr/lib/plainbox-providers-1/certification-server-soc
2usr/share/plainbox-providers-1/certification-server-soc.provider
03
=== added file 'debian/plainbox-provider-certification-server.install'
--- debian/plainbox-provider-certification-server.install 1970-01-01 00:00:00 +0000
+++ debian/plainbox-provider-certification-server.install 2014-03-28 14:20:51 +0000
@@ -0,0 +1,3 @@
1usr/lib/plainbox-providers-1/certification-server
2usr/share/plainbox-providers-1/certification-server.provider
3debian/extras/canonical-certification-config/canonical-certification.conf /etc/xdg
04
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2014-03-28 14:20:51 +0000
@@ -0,0 +1,19 @@
1#!/usr/bin/make -f
2#export DH_VERBOSE=1
3
4providers=plainbox-provider-certification-client \
5 plainbox-provider-certification-server \
6 plainbox-provider-certification-server-soc
7
8%:
9 dh "$@"
10
11override_dh_auto_clean:
12 rm -rf $(foreach provider,$(providers),$(CURDIR)/$(provider)/*.egg-info)
13
14override_dh_auto_build:
15 $(foreach provider,$(providers),cd $(CURDIR)/$(provider) && python3 setup.py build;)
16
17override_dh_auto_install:
18 $(foreach provider,$(providers),cd $(CURDIR)/$(provider) && python3 setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb;)
19 dh_install
020
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2014-03-28 14:20:51 +0000
@@ -0,0 +1,1 @@
13.0 (native)

Subscribers

People subscribed via source and target branches