Merge lp://staging/~panfaust/kubuntu-packaging/kplotting-work into lp://staging/~kubuntu-packagers/kubuntu-packaging-next/kplotting
Proposed by
Jose Manuel Santamaria Lema
| Status: | Merged |
|---|---|
| Merged at revision: | 22 |
| Proposed branch: | lp://staging/~panfaust/kubuntu-packaging/kplotting-work |
| Merge into: | lp://staging/~kubuntu-packagers/kubuntu-packaging-next/kplotting |
| Diff against target: |
67 lines (+27/-1) (has conflicts) 3 files modified
debian/changelog (+10/-0) debian/control (+16/-0) debian/libkf5plotting-dev.install (+1/-1) Text conflict in debian/changelog Text conflict in debian/control |
| To merge this branch: | bzr merge lp://staging/~panfaust/kubuntu-packaging/kplotting-work |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kubuntu Packagers | Pending | ||
|
Review via email:
|
|||
Description of the change
* Re-add libkf5plotting-dev after faulty wrap-and-sort.
* Install *.pri files in arch dependent path.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
