x11-xserver-utils: Changes to 'debian-unstable'
debian/changelog | 4 ++--
debian/control | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit ad6e57b05d464a54e2abf39b47dad316b99baf99
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue May 22 12:13:19 2007 +0300
Conflict with the ubuntu packages to force removal on upgrade.
Add xrgb and xsetpointer to the C/R list.
diff --git a/debian/changelog b/debian/changelog
index 9284755..e44f19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
- Modify description.
- 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
+ - C/R: <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*
@@ -35,7 +35,7 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
* debian/local/: Remove.
* 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
diff --git a/debian/control b/debian/control
index 6023ee1..8fc2bc9 100644
--- a/debian/control
+++ b/debian/control
@@ -35,9 +35,11 @@ Package: x11-xserver-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
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),
- iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
- xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
+ iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
Description: X server utilities
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
Reply to: