xorg-server: Changes to 'debian-unstable'
debian/changelog | 9 +++++++++
debian/control | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 60b5dd68e121b7cc925dbca0d915e647b5dd8e84
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 17:24:53 2007 -0500
* Conflict with xserver-common, because that package used to provide the
SecurityPolicy file. This is an RC bugfix because it breaks upgrades,
so it gets a high urgency. Thanks Christian Tsotras and Lionel Elie Mamane
for reporting and it. Closes: #402658
diff --git a/debian/changelog b/debian/changelog
index 200e40e..d585ba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.1.1-19) unstable; urgency=high
+
+ * Conflict with xserver-common, because that package used to provide the
+ SecurityPolicy file. This is an RC bugfix because it breaks upgrades,
+ so it gets a high urgency. Thanks Christian Tsotras and Lionel Elie Mamane
+ for reporting and it. Closes: #402658
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 28 Feb 2007 17:22:08 -0500
+
xorg-server (2:1.1.1-18) unstable; urgency=medium
* Add patch from Fedora to make xephyr work on 64bit architectures
diff --git a/debian/control b/debian/control
index bb0888f..cd1e8ec 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: any
Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
Recommends: xkb-data, xfonts-base
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
-Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
Provides: xserver
Description: X.Org X server -- core server
Reply to: