xsm: Changes to 'debian-unstable'
debian/changelog | 5 ++++-
debian/control | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 3b3b778bb2f578befa1d6b098106d03623d880dc
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 02:02:31 2007 +0300
debian/control: add Conflicts/Replaces.
diff --git a/debian/changelog b/debian/changelog
index 88f5d76..3c67c58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xsm (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.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*rstart missing*
* debian/xsm.install, rules: Edit to reflect new packaging.
@@ -16,7 +19,7 @@ xsm (1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Thu, 17 May 2007 09:14:34 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 19 May 2007 02:01:15 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8627172..6077dcf 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,8 @@ 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:
- rstart;
commit 18b5c313cead52b4bb09cb0bbd9e49baa46b1952
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Fri May 18 11:12:36 2007 +0300
debian/control: update description about rstart/rstartd (from xutils).
diff --git a/debian/control b/debian/control
index 125b6d6..8627172 100644
--- a/debian/control
+++ b/debian/control
@@ -24,3 +24,6 @@ Description: X session manager
- smproxy, a session manager proxy for X clients that do not use the X
session manager protocol;
- xsm, a session manager for X sessions;
+ Installation of an rsh or ssh daemon (server) is necessary if rstartd is
+ to be used, and installation of an rsh or ssh client is necessary if
+ rstart is to be used.
Reply to: