Conflict with the ubuntu packages to force removal on upgrade.

Add xrgb and xsetpointer to the C/R list.
This commit is contained in:
Timo Aaltonen 2007-05-22 12:13:19 +03:00
parent 6e1e2a7e1b
commit ad6e57b05d
2 changed files with 6 additions and 4 deletions

4
debian/changelog vendored
View File

@ -25,7 +25,7 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
- Modify description. - Modify description.
- 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)
to make upgrades smoother. to make upgrades smoother.
- Replaces: <all the included packages> to work around old Ubuntu - C/R: <all the included packages> to work around old Ubuntu
packaging. 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*
@ -35,7 +35,7 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
* debian/local/: Remove. * debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package. * debian/patches: Delete patches which do not relate to this package.
-- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 19 May 2007 01:37:29 +0300 -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 22 May 2007 12:00:41 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low xbase-clients (1:7.2.ds2-3) unstable; urgency=low

6
debian/control vendored
View File

@ -35,9 +35,11 @@ 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: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
xsetmode, xsetpointer, 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, xrgb, xset,
xsetmode, xsetroot, xstdcmap, xtrap, xvidtune xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
Description: X server utilities Description: X server utilities
An X client is a program that interfaces with an X server (almost always via An X client is a program that interfaces with an X server (almost always via
the X libraries), and thus with some input and output hardware like a the X libraries), and thus with some input and output hardware like a