debian/changelog | 6 +++--- debian/control | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 7a56d4384905af01ec3f302a315993cb05a1791b Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Sat May 19 14:17:27 2007 +0300 Remove Conflicts:, which shouldn't be necessary. diff --git a/debian/changelog b/debian/changelog index d5e969c..3460947 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,9 +9,9 @@ xsm (1:1.0.1-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: smproxy 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: smproxy to work around old Ubuntu packaging. * debian/copyright: Leave only copyright notices that relate to this package. FIXME:*rstart missing* * debian/xsm.install, rules: Edit to reflect new packaging. diff --git a/debian/control b/debian/control index 6077dcf..b5594f0 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,6 @@ Package: xsm 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), smproxy Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), smproxy Description: X session manager This package provides the X session manager and related tools: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]