debian/changelog | 6 +++---
debian/control | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 9019e9079b7f2ec6cd1c8e17eb82003afa892799
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Sat May 19 14:08:52 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index 4599ff7..e963c29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,9 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Copy description from Ubuntu xkbutils-package.
- - 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 relate to
this package.
* debian/x11-xkb-utils.{dirs,install}, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index 8f8ad0f..aaa471c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Package: x11-xkb-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), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
Replaces: xbase-clients (<= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd,
xkbprint, xkbutils
Description: X11 XKB utilities
xkbutils contains a number of client-side utilities for XKB, the X11
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
