jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Conflicts:, which shouldn't be necessary.

This commit is contained in:
Timo Aaltonen 2007-05-19 14:10:14 +03:00
parent 12eae675d3
commit 6e1e2a7e1b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -23,9 +23,10 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
- Rename Package and Source. - Rename Package and Source.
- Remove unnecessary Build-Deps. - Remove unnecessary Build-Deps.
- Modify description. - Modify description.
- Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3), - Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
xutils (<=1:7.1.ds.3-1) to make upgrades smoother. to make upgrades smoother.
- C/R: <all the included packages> to work around old Ubuntu packaging. - Replaces: <all the included packages> to work around old Ubuntu
packaging.
* debian/copyright: Leave only copyright notices that relate to * debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rgb, sessreg missing* this package. FIXME:*rgb, sessreg missing*
* debian/x11-xserver-utils.install, rules: Edit to reflect new * debian/x11-xserver-utils.install, rules: Edit to reflect new

3
debian/control vendored
View File

@ -35,9 +35,6 @@ Package: x11-xserver-utils
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0) 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), Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset, iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
xsetmode, xsetroot, xstdcmap, xtrap, xvidtune xsetmode, xsetroot, xstdcmap, xtrap, xvidtune