This shows you the differences between two versions of the page.
packman:gurumerge [2012/01/14 03:51] 0.0.0.0 created |
packman:gurumerge [2012/01/14 05:00] (current) mschiff |
||
---|---|---|---|
Line 1: | Line 1: | ||
====== Conflicts ====== | ====== Conflicts ====== | ||
- | {| border="1" cellpadding="2" | + | |
- | ! Conflicting package !! Packman maintainer !! which spec to keep | + | ^ Conflicting package ^ Packman maintainer ^ which spec to keep |
- | |- | + | | k3b | rainer | |
- | | k3b || rainer || ??? | + | | (k)dar | herbert | |
- | |- | + | | dvd+rw-tools | rainer | |
- | | (k)dar || herbert || packman | + | | lame | henne | |
- | |- | + | | kmobiletools | quentin | |
- | | dvd+rw-tools || rainer || ??? | + | | xchat | quentin | |
- | |- | + | | (lib)musepack | quentin | |
- | | lame || henne || ??? | + | | knemo | herbert | |
- | |- | + | | kolourpaint | herbert | |
- | | kmobiletools || quentin || packman | + | | gtk-qt-engine | herbert | |
- | |- | + | | fame | manfred | |
- | | xchat || quentin || ??? | + | | curl | manfred | |
- | |- | + | | libtheora | manfred | |
- | | (lib)musepack || quentin || packman | + | | ffmpeg | manfred | |
- | |- | + | | xvid/xvidcore | manfred | |
- | | knemo || herbert || packman | + | | baghira | manfred | |
- | |- | + | | imlib2 | manfred | |
- | | kolourpaint || herbert || packman | + | | libfame | manfred | |
- | |- | + | |
- | | gtk-qt-engine || herbert || packman | + | |
- | |- | + | |
- | | fame || manfred || ??? | + | |
- | |- | + | |
- | | curl || manfred || ??? | + | |
- | |- | + | |
- | | libtheora || manfred || packman | + | |
- | |- | + | |
- | | ffmpeg || manfred || packman | + | |
- | |- | + | |
- | | xvid/xvidcore || manfred || packman | + | |
- | |- | + | |
- | | baghira || manfred || ??? | + | |
- | |- | + | |
- | | imlib2 || manfred || packman | + | |
- | |- | + | |
- | | libfame || manfred || packman | + | |
- | |} | + | |
====== Conflicts with other (suser-)packagers ====== | ====== Conflicts with other (suser-)packagers ====== | ||
- | {| border="1" cellpadding="2" | + | |
- | ! Conflicting package !! Other maintainer !! Packman maintainer !! which spec to keep | + | ^ Conflicting package ^ Other maintainer ^ Packman maintainer ^ which spec to keep |
- | |- | + | | htop | oc2pus | guru | | |
- | | htop || oc2pus || guru || ??? | + | |
- | |} | + | |
solved, as oc2pus has merged with packman, the future htop packages will be maintained by Pascal | solved, as oc2pus has merged with packman, the future htop packages will be maintained by Pascal |