debian/changelog | 4 ++--
debian/control | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 5950b7522e81c56f361ccd657676f724cbe1f5cf
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Mar 4 02:07:10 2007 +0100
x11-common already conflicted with hanterm-*, so remove the duplicate
conflict.
diff --git a/debian/changelog b/debian/changelog
index 8eaba01..7fa8209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
xorg (1:7.1.0-14) unstable; urgency=high
- * Add conflict on old versions of hamsoft, hanterm-classic, and hanterm-xf
- in x11-common (closes: #413281). Thanks, Bill Allombert!
+ * Add conflict on old versions of hamsoft in x11-common (closes: #413281).
+ Thanks, Bill Allombert!
-- Julien Cristau <[EMAIL PROTECTED]> Sun, 4 Mar 2007 00:59:54 +0100
diff --git a/debian/control b/debian/control
index 9d7cbe5..0d8c532 100644
--- a/debian/control
+++ b/debian/control
@@ -60,8 +60,7 @@ Conflicts: xfree86-common, xorg-common,
xpmumon (<= 1.3.0), ivtools-dev (<= 1.1.3-5), ppxp (<= 0.2001080415-14),
guitar (<= 0.1.4-11), xftp, xext, xpaste, ghostview, xv (<= 3.10a-26),
xserver-xfree86-dbg, grace6 (<= 5.99.0+final-4), xephem,
- opera (<< 9.10-20060616), hamsoft (<< 0.2.3-1), hanterm-classic,
- hanterm-xf (<< 1:3.3.1p18-10)
+ opera (<< 9.10-20060616), hamsoft (<< 0.2.3-1)
Replaces: xfree86-common, xorg-common, xserver-common, x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
