x11-xfs-utils: Changes to 'debian-unstable'
debian/changelog | 8 ++++----
debian/control | 2 --
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit f0e9da4a6bc97935148e81da9418b918fd15a66e
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 14:07:34 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index a820bf1..a1e22fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,10 @@ x11-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.
+ - Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1)
+ to make upgrades smoother.
+ - Replaces: fslsfonts, fstobdf, showfont, xfsinfo to work around old
+ Ubuntu packaging.
* debian/copyright: Add fstobdf.
* debian/x11-xfs-utils.dirs: Remove.
* debian/x11-xfs-utils.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index e9adf3c..89752f3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,6 @@ Package: x11-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
Reply to: