xorg: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/control | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 0759e26e95e157480d258352d6c0475bef3d0ca1
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 4 01:06:52 2007 +0100
Add three new conflicts for x11-common.
hamsoft, hanterm-classic and hanterm-xf used to install files in
/usr/X11R6/bin, so x11-common needs to conflict with them.
diff --git a/debian/changelog b/debian/changelog
index 058ec5f..8eaba01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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!
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 4 Mar 2007 00:59:54 +0100
+
xorg (1:7.1.0-13) unstable; urgency=high
* debian/local/Xsession: set temporary umask when creating $ERRFILE. Thanks
diff --git a/debian/control b/debian/control
index 8e6293c..9d7cbe5 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,8 @@ 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)
+ opera (<< 9.10-20060616), hamsoft (<< 0.2.3-1), hanterm-classic,
+ hanterm-xf (<< 1:3.3.1p18-10)
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
Reply to: