Merge lp://qastaging/~ken-vandine/ubuntu/utopic/folks/misc into lp://qastaging/ubuntu/utopic/folks
Proposed by
Ken VanDine
| Status: | Merged |
|---|---|
| Merged at revision: | 59 |
| Proposed branch: | lp://qastaging/~ken-vandine/ubuntu/utopic/folks/misc |
| Merge into: | lp://qastaging/ubuntu/utopic/folks |
| Diff against target: |
135 lines (+59/-6) 7 files modified
debian/changelog (+9/-0) debian/control (+43/-0) debian/libfolks-dev.install (+0/-3) debian/libfolks-misc-dev.install (+3/-0) debian/libfolks-misc25.install (+2/-0) debian/libfolks25.install (+0/-2) debian/rules (+2/-1) |
| To merge this branch: | bzr merge lp://qastaging/~ken-vandine/ubuntu/utopic/folks/misc |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Split the dummy and key-file backends into a new libfolks-misc25
package, having them installed with libfolks25 caused them to
always get loaded at runtime, but they are only used
for tests (LP: #1364548)
To post a comment you must log in.
Revision history for this message
| Renato Araujo Oliveira Filho (renatofilho) | # |
Revision history for this message
| Daniel Holbach (dholbach) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I think you're going to need conflicts/replaces.