xinit: Changes to 'debian-unstable'
debian/changelog | 3 +--
debian/control | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit e131349a9302c9a1f25d287ccc1f766cd3f594dc
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 14:15:50 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index 07f0cb3..1f0030c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,7 @@ xinit (1.0.2-1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
- - Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make
- upgrades smoother.
+ - Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother.
* debian/copyright: Leave only copyright notices that relate to
this package.
* debian/xinit.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index bc04d6f..010ffcc 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Package: xinit
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0)
-Conflicts: xbase-clients (<= 1:7.2.ds2-3)
Replaces: xbase-clients (<= 1:7.2.ds2-3)
Description: X server initialisation tool
xinit and startx are programs which facilitate starting an X server, and
Reply to: