diff --git a/debian/changelog b/debian/changelog index 101169e..9284755 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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: 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: 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 diff --git a/debian/control b/debian/control index f5edb7a..6023ee1 100644 --- a/debian/control +++ b/debian/control @@ -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