Merge lp:~sil2100/qtubuntu-cameraplugin-fake/remove_breaks into lp:qtubuntu-cameraplugin-fake

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 36
Merged at revision: 37
Proposed branch: lp:~sil2100/qtubuntu-cameraplugin-fake/remove_breaks
Merge into: lp:qtubuntu-cameraplugin-fake
Diff against target: 11 lines (+0/-1)
1 file modified
debian/control (+0/-1)
To merge this branch: bzr merge lp:~sil2100/qtubuntu-cameraplugin-fake/remove_breaks
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+175776@code.launchpad.net

Commit message

As per Didier's advice, Breaks is not necessary here, Conflicts is enough

Description of the change

As per Didier's advice, Breaks is not necessary here, Conflicts is enough

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

yeaahhhhh!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-07-17 17:07:41 +0000
3+++ debian/control 2013-07-19 09:14:22 +0000
4@@ -20,7 +20,6 @@
5 Depends: ${misc:Depends},
6 ${shlibs:Depends},
7 Conflicts: cameraplugin-fake-tests
8-Breaks: cameraplugin-fake-tests
9 Description: Camera plugin for QtMultimedia faking with a photo file
10 A plugin for QtMultimedia faking a real camera by using
11 an image from disk as source of the photo.

Subscribers

People subscribed via source and target branches