This shows you the differences between two versions of the page.
|
packman:gurumerge [2012/01/14 04:58] mschiff [Table] |
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 || | + | | (k)dar | herbert | |
| - | | dvd+rw-tools || rainer || | + | | dvd+rw-tools | rainer | |
| - | | lame || henne || | + | | lame | henne | |
| - | | kmobiletools || quentin || | + | | kmobiletools | quentin | |
| - | | xchat || quentin || | + | | xchat | quentin | |
| - | | (lib)musepack || quentin || | + | | (lib)musepack | quentin | |
| - | | knemo || herbert || | + | | knemo | herbert | |
| - | | kolourpaint || herbert || | + | | kolourpaint | herbert | |
| - | | gtk-qt-engine || herbert || | + | | gtk-qt-engine | herbert | |
| - | | fame || manfred || | + | | fame | manfred | |
| - | | curl || manfred || | + | | curl | manfred | |
| - | | libtheora || manfred || | + | | libtheora | manfred | |
| - | | ffmpeg || manfred || | + | | ffmpeg | manfred | |
| - | | xvid/xvidcore || manfred || | + | | xvid/xvidcore | manfred | |
| - | | baghira || manfred || | + | | baghira | manfred | |
| - | | imlib2 || manfred || | + | | imlib2 | manfred | |
| - | | libfame || manfred || | + | | libfame | manfred | |
| ====== 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 | ||