Merge lp:~zyga/checkbox/fix-1296965 into lp:~checkbox-dev/checkbox/checkbox-packaging

Proposed by Zygmunt Krynicki on 2014-03-25
Status: Merged
Approved by: Jeff Lane on 2014-03-25
Approved revision: 70
Merged at revision: 70
Proposed branch: lp:~zyga/checkbox/fix-1296965
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 24 lines (+3/-0)
2 files modified
debian/changelog (+2/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1296965
Reviewer Review Type Date Requested Status
Jeff Lane 2014-03-25 Approve on 2014-03-25
Review via email: mp+212661@code.launchpad.net

Commit message

Adds nmap to canonical-certification-server provider

Description of the change

Adds nmap to canonical-certification-server provider

To post a comment you must log in.
Jeff Lane (bladernr) wrote :

Awesome, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-20 14:50:46 +0000
+++ debian/changelog 2014-03-25 16:10:35 +0000
@@ -10,6 +10,8 @@
1010
11 [ Zygmunt Krynicki ]11 [ Zygmunt Krynicki ]
12 * Drop packages related to checkbox-old (moved to separate packaging branch)12 * Drop packages related to checkbox-old (moved to separate packaging branch)
13 * debian/control: make plainbox-provider-certification-server depend on
14 nmap. (LP: #1296965)
1315
14 -- Daniel Manrique <roadmr@ubuntu.com> Fri, 14 Mar 2014 13:25:25 -040016 -- Daniel Manrique <roadmr@ubuntu.com> Fri, 14 Mar 2014 13:25:25 -0400
1517
1618
=== modified file 'debian/control'
--- debian/control 2014-03-20 14:50:46 +0000
+++ debian/control 2014-03-25 16:10:35 +0000
@@ -130,6 +130,7 @@
130 ipmitool,130 ipmitool,
131 libapache2-mod-php5,131 libapache2-mod-php5,
132 mysql-server,132 mysql-server,
133 nmap,
133 php5-mysql,134 php5-mysql,
134 qemu-kvm,135 qemu-kvm,
135 qemu-utils,136 qemu-utils,

Subscribers

People subscribed via source and target branches