Merge lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work2 into lp:~kubuntu-packagers/kubuntu-packaging-next/kmediaplayer
Proposed by
Jose Manuel Santamaria Lema
Status: | Superseded |
---|---|
Proposed branch: | lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work2 |
Merge into: | lp:~kubuntu-packagers/kubuntu-packaging-next/kmediaplayer |
Diff against target: |
88 lines (+42/-14) (has conflicts) 4 files modified
debian/changelog (+10/-2) debian/control (+31/-11) debian/libkf5mediaplayer-data.install (+1/-0) debian/libkf5mediaplayer5.install (+0/-1) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scarlett Gately Moore | Needs Fixing | ||
Review via email:
|
This proposal has been superseded by a proposal from 2014-07-15.
Description of the change
Add -data package. This merge request is the right version of this wrong one
https:/
To post a comment you must log in.
Unmerged revisions
- 33. By Jose Manuel Santamaria Lema
-
Create -data package to provide architecture independent files.
Something funky going on with the changelog. Looks like you want to merge a bzr conflict?