x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog | 4 ++--
debian/control | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 58e9c2464cdc3b02755e6ca160abd862daf9ae15
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue May 22 12:41:13 2007 +0300
Conflict with the ubuntu packages to force removal on upgrade.
diff --git a/debian/changelog b/debian/changelog
index e963c29..2e90e19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
- Remove unnecessary Build-Deps.
- Copy description from Ubuntu xkbutils-package.
- Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother.
- - Replaces: <all the included packages> to work around old Ubuntu
+ - C/R: <all the included packages> to work around old Ubuntu
packaging.
* debian/copyright: Leave only copyright notices that relate to
this package.
@@ -21,7 +21,7 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
* debian/local/: Remove.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Sat, 19 May 2007 01:27:59 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 22 May 2007 12:40:12 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index aaa471c..7e856f9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: x11-xkb-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0)
+Conflicts: 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
Reply to: