xorg: Changes to 'debian-unstable'
debian/changelog | 14 ++++++++++++++
debian/control | 4 +++-
2 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 4ce1350edafe490b67f23cf90410bdbe256190c0
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 6 02:59:47 2007 +0200
New conflicts for x11-common.
Its Conflicts field was still a bit too short.
diff --git a/debian/changelog b/debian/changelog
index d58254f..673c875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xorg (1:7.1.0-18) unstable; urgency=high
+
+ * Add more conflicts to x11-common:
+ + communicator-smotif-477
+ + epan
+ + navigator-smotif-477
+ + stella (<< 2.2-1)
+ + xfractint (<< 20.3.01-1)
+ + xgobi
+ + xpostitplus
+ + xisp
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 06 Apr 2007 02:54:22 +0200
+
xorg (1:7.1.0-17) unstable; urgency=high
* x11-common Conflicts with netscape-base-4 (from woody/contrib). Reported
diff --git a/debian/control b/debian/control
index 9f8177d..513e92d 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,9 @@ Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
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), phototk, tkworld,
- ucbmpeg-play (<< 2.3p-13), netscape-base-4
+ ucbmpeg-play (<< 2.3p-13), netscape-base-4, communicator-smotif-477, epan,
+ navigator-smotif-477, stella (<< 2.2-1), xfractint (<< 20.3.01-1), xgobi,
+ xpostitplus, xisp
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: