debian/changelog | 6 +++---
debian/control | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit df8d61038a61f2d70f37f89613b78cfe353ae3c0
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Mar 4 16:44:30 2007 +0100
Yet another conflict update for x11-common.
diff --git a/debian/changelog b/debian/changelog
index 7fa8209..8fb9b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
xorg (1:7.1.0-14) unstable; urgency=high
- * Add conflict on old versions of hamsoft in x11-common (closes: #413281).
- Thanks, Bill Allombert!
+ * Add conflict on old versions of hamsoft, phototk and tkworld in x11-common
+ (closes: #413281, #413339). Thanks, Bill Allombert!
- -- Julien Cristau <[EMAIL PROTECTED]> Sun, 4 Mar 2007 00:59:54 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 4 Mar 2007 16:42:36 +0100
xorg (1:7.1.0-13) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 0d8c532..f57ea79 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +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)
+ opera (<< 9.10-20060616), hamsoft (<< 0.2.3-1), phototk, tkworld
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]
