Remove Conflicts:, which shouldn't be necessary.
This commit is contained in:
parent
12eae675d3
commit
6e1e2a7e1b
|
@ -23,9 +23,10 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
|
|||
- Rename Package and Source.
|
||||
- Remove unnecessary Build-Deps.
|
||||
- Modify description.
|
||||
- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3),
|
||||
xutils (<=1:7.1.ds.3-1) to make upgrades smoother.
|
||||
- C/R: <all the included packages> to work around old Ubuntu packaging.
|
||||
- Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
|
||||
to make upgrades smoother.
|
||||
- Replaces: <all the included packages> to work around old Ubuntu
|
||||
packaging.
|
||||
* debian/copyright: Leave only copyright notices that relate to
|
||||
this package. FIXME:*rgb, sessreg missing*
|
||||
* debian/x11-xserver-utils.install, rules: Edit to reflect new
|
||||
|
|
|
@ -35,9 +35,6 @@ Package: x11-xserver-utils
|
|||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
|
||||
Pre-Depends: x11-common (>= 1:7.0.0)
|
||||
Conflicts: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
|
||||
iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
|
||||
xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
|
||||
Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
|
||||
iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
|
||||
xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
|
||||
|
|
Loading…
Reference in New Issue