x11-xfs-utils: Changes to 'debian-unstable'
debian/changelog | 4 ++--
debian/control | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6a2f197fef236493ac971f8d21a1e4aeff641c15
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue May 22 12:35:59 2007 +0300
Conflict with the ubuntu packages to force removal on upgrade.
diff --git a/debian/changelog b/debian/changelog
index a1e22fb..1eecdec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ x11-xfs-utils (1) UNRELEASED; urgency=low
- Clean up the description.
- 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
+ - C/R: fslsfonts, fstobdf, showfont, xfsinfo to work around old
Ubuntu packaging.
* debian/copyright: Add fstobdf.
* debian/x11-xfs-utils.dirs: Remove.
@@ -21,7 +21,7 @@ x11-xfs-utils (1) UNRELEASED; urgency=low
* debian/patches: Remove.
* debian/rules: Comment out files from scripts/.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 19 May 2007 11:48:38 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 22 May 2007 12:34:17 +0300
xutils (1:7.1.ds.3-2) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 89752f3..01bfe02 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Package: x11-xfs-utils
Architecture: any
Pre-Depends: x11-common (>= 1:7.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}, xfonts-utils, xutils-dev
+Conflicts: 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: