debian/changelog | 5 ++++-
debian/control | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5227fac3918bdc9193c7b3401a64bef5cf07354d
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Sat May 19 01:32:29 2007 +0300
debian/control: add Conflicts/Replaces.
diff --git a/debian/changelog b/debian/changelog
index 8c6e808..4599ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +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.
* debian/copyright: Leave only copyright notices that relate to
this package.
* debian/x11-xkb-utils.{dirs,install}, rules: Edit to reflect new
@@ -18,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 <[EMAIL PROTECTED]> Wed, 16 May 2007 22:58:53 +0300
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Sat, 19 May 2007 01:27:59 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6493148..8f8ad0f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
libxaw7-dev (>= 1:1.0.1-1), libxkbfile-dev (>= 1:1.0.1-1), quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
+ libxaw7-dev (>= 1:1.0.1-1), libxkbfile-dev (>= 1:1.0.1-1), quilt
# Reasons for build-depends:
#Â debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -20,6 +21,8 @@ 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
keyboard extension.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
