debian/changelog | 5 ++--- debian/control | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-)
New commits: commit 13a7a180651337a5ab119f8f90546f962f529903 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Sat May 19 14:02:09 2007 +0300 Remove Conflicts:, which shouldn't be necessary. diff --git a/debian/changelog b/debian/changelog index b778d2c..bf93220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,9 +25,8 @@ x11-apps (1) UNRELEASED; urgency=low - Remove unnecessary Build-Deps. - Split the Build-Dep line into multiple lines - Clean up the description. - - Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades - smoother. - - C/R: <all the included packages> to work around old Ubuntu packaging. + - Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother. + - Replaces: <all the included packages> to work around old Ubuntu packaging. * debian/copyright: Leave only copyright notices that affect this package. * debian/x11-apps.dirs: Remove. * debian/x11-apps.install, rules: Edit to reflect new packaging. diff --git a/debian/control b/debian/control index 6913d19..87fb751 100644 --- a/debian/control +++ b/debian/control @@ -37,9 +37,6 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, cpp Pre-Depends: x11-common (>= 1:7.0.0) Suggests: mesa-utils -Conflicts: xbase-clients (<= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, xclipboard, - xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, xman, - xmore, xwd, xwud Replaces: xbase-clients (<= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, xman, xmore, xwd, xwud -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]