x11-utils: Changes to 'debian-unstable'
debian/changelog | 7 ++++---
debian/control | 3 ---
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit b5f50c8b7ae90974077beafb5d0552a6c00bf52e
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 14:06:23 2007 +0300
Remove Conflicts:, which shouldn't be necessary.
diff --git a/debian/changelog b/debian/changelog
index 2a18106..abcfc2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,9 +24,10 @@ x11-utils (1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
- - Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3),
- xutils (<=1:7.1.ds.3-1) to make upgrades smoother.
- - C/R: <all the included packages> 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: <all the included packages> to work around old Ubuntu
+ packaging.
* debian/copyright: Leave only copyright notices that relate to
this package. FIXME:*luit missing*
* debian/x11-utils.install, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index 0f8fd6f..1832cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -40,9 +40,6 @@ Package: x11-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), xutils (<= 1:7.1.ds.3-1),
- appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, xfontsel,
- xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo
Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, xfontsel,
xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo
Reply to: