xfs-utils: Changes to 'debian-unstable'
debian/changelog | 6 +++++-
debian/control | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit aa187529eae4987cfc46ff3824a74a3e05d2acd1
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 02:04:11 2007 +0300
debian/control: add Conflicts/Replaces.
diff --git a/debian/changelog b/debian/changelog
index ee5107f..5e67024 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,13 +10,17 @@ xfs-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Clean up the description.
+ - Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3),
+ xutils (<=1:7.1.ds.3-1) to make upgrades smoother.
+ - C/R: fslsfonts, fstobdf, showfont, xfsinfo to work around old Ubuntu
+ packaging.
* debian/copyright: Add fstobdf.
* debian/xfs-utils.dirs: Remove.
* debian/xfs-utils.install, rules: Edit to reflect new packaging.
* debian/local/: Remove.
* debian/patches: Remove.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 19 May 2007 00:19:43 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Sat, 19 May 2007 00:48:41 +0300
xutils (1:7.1.ds.3-2) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 0109768..6331e97 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,10 @@ Package: xfs-utils
Architecture: any
Pre-Depends: x11-common (>= 1:7.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, xfonts-utils, xutils-dev
+Conflicts: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
+ fslsfonts, fstobdf, showfont, xfsinfo
+Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
+ fslsfonts, fstobdf, showfont, xfsinfo
Description: X font server utilities
xfs-utils provides a set of utility programs useful on a system that uses
a X font server.
Reply to: