diff --git a/debian/changelog b/debian/changelog index 7b30b04..b1a1fb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ x11-xserver-utils (7.3+2) UNRELEASED; urgency=low + [ Timo Aaltonen ] * control: add x11proto-xf86misc-dev to build-depends, it's useful for xset. - -- Timo Aaltonen <tjaalton@cc.hut.fi> Fri, 30 Nov 2007 00:59:58 +0200 + [ Julien Cristau ] + * Preventively relax Replaces on xutils and xbase-clients so those packages + can still be updated if needed (e.g. in stable updates). + + -- Julien Cristau <jcristau@debian.org> Mon, 03 Dec 2007 19:09:45 +0100 x11-xserver-utils (7.3+1) unstable; urgency=low diff --git a/debian/control b/debian/control index 956739b..efbe8ab 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ 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), +Replaces: xbase-clients (<< 1:7.3), xutils (<< 1:7.2), iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune Description: X server utilities