xorg: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/control | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 206d911378f52cb91a20890a2f68309bdfc19206
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 6 01:47:05 2007 +0200
x11-common Conflicts with netscape-base-4 (from woody/contrib).
diff --git a/debian/changelog b/debian/changelog
index d3111a1..d58254f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.1.0-17) unstable; urgency=high
+
+ * x11-common Conflicts with netscape-base-4 (from woody/contrib). Reported
+ by Lennart Sorensen.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 06 Apr 2007 01:45:17 +0200
+
xorg (1:7.1.0-16) unstable; urgency=high
[ Christian Perrier ]
diff --git a/debian/control b/debian/control
index 7e481d9..9f8177d 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,7 @@ 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)
+ ucbmpeg-play (<< 2.3p-13), netscape-base-4
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: