Merge lp:~zeller-benjamin/kubuntu-packaging/qtcreator into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator
Proposed by
Zoltan Balogh
Status: | Needs review |
---|---|
Proposed branch: | lp:~zeller-benjamin/kubuntu-packaging/qtcreator |
Merge into: | lp:~kubuntu-packagers/kubuntu-packaging/qtcreator |
Diff against target: |
195 lines (+53/-28) (has conflicts) 6 files modified
debian/changelog (+9/-0) debian/control (+3/-0) debian/patches/disable_plugins.diff (+39/-8) debian/patches/series (+1/-1) debian/qtcreator.install (+0/-18) debian/rules (+1/-1) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp:~zeller-benjamin/kubuntu-packaging/qtcreator |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dmitry Shachnev | Needs Fixing | ||
Timo Jyrinki | Pending | ||
Review via email: mp+214891@code.launchpad.net |
Commit message
Replace qnx, valgrind and remotelinux plugins with derived versiond
Description of the change
Replace qnx, valgrind and remotelinux plugins with derived versiond
To post a comment you must log in.
Unmerged revisions
- 126. By Benjamin Zeller
-
-Remove remotelinux/
qnx/valgrind plugins from install file - 125. By Benjamin Zeller
-
Filter out removed plugins from the share directory
- 124. By Benjamin Zeller
-
Make qnx,remotelinux and valgrind plugins recommended packages
- 123. By Benjamin Zeller
-
* Replace Qnx,Remotelinux and Valgrind plugins with derived ones
- Add debian/patches/ disable_ plugins. diff to disable QtC's versions
- To be sorted out with upstream when Ubuntu's modifications ready
Why is this needed? What is the difference between the embedded plugins and external ones? Did you submit the patches to Debian or upstream?
Also, there is a conflict in debian/changelog, please resolve that before it can be merged.