Merge lp:~cr3/checkbox-certification/1024078 into lp:checkbox-certification

Proposed by Marc Tardif
Status: Merged
Merged at revision: 517
Proposed branch: lp:~cr3/checkbox-certification/1024078
Merge into: lp:checkbox-certification
Diff against target: 12 lines (+1/-1)
1 file modified
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cr3/checkbox-certification/1024078
Reviewer Review Type Date Requested Status
Brendan Donegan (community) Approve
Review via email: mp+115371@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

We established that this wasn't even required in the first place, so there's no harm in removing it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2012-07-11 18:42:04 +0000
+++ debian/control 2012-07-17 15:35:26 +0000
@@ -58,7 +58,7 @@
58Provides: checkbox-certification-gtk58Provides: checkbox-certification-gtk
59Depends: checkbox-certification (= ${source:Version}), checkbox-qt (>= 0.14~ppa), xdg-user-dirs59Depends: checkbox-certification (= ${source:Version}), checkbox-qt (>= 0.14~ppa), xdg-user-dirs
60Conflicts: checkbox-certification-gtk (<< 0.14)60Conflicts: checkbox-certification-gtk (<< 0.14)
61Recommends: flashplugin-installer, fswebcam, gtkperf, imagemagick, xawtv61Recommends: fswebcam, gtkperf, imagemagick, xawtv
62Description: Client Certification62Description: Client Certification
63 This project extends the checkbox project with client certification63 This project extends the checkbox project with client certification
64 specific data and plugins.64 specific data and plugins.

Subscribers

People subscribed via source and target branches