Author: dparsons
Date: 2006-08-22 11:24:35 -0400 (Tue, 22 Aug 2006)
New Revision: 2904
Modified:
branches/7.1/xserver/xorg-server/debian/changelog
branches/7.1/xserver/xorg-server/debian/control
Log:
* xserver-xorg-core no longer Depends: xserver-xorg-video-all
| xserver-xorg-video. The dependency is managed by the xserver-xorg
binary package (not included here in order to avoid circular dependencies).
* Likewise remove Depends: xserver-xorg-input-all | xserver-xorg-input
(again, handled by xserver-xorg) to avoid circular dependency with
drivers.
Modified: branches/7.1/xserver/xorg-server/debian/changelog
===================================================================
--- branches/7.1/xserver/xorg-server/debian/changelog 2006-08-22 15:14:18 UTC
(rev 2903)
+++ branches/7.1/xserver/xorg-server/debian/changelog 2006-08-22 15:24:35 UTC
(rev 2904)
@@ -1,11 +1,16 @@
xorg-server (1:1.1.1-4) UNRELEASED; urgency=low
* Tighten dependencies between X11R7.1 server and video drivers.
- xserver-xorg-core Depends: xserver-xorg-video-all | xserver-xorg-video-1.0
- and Conflicts: xserver-xorg-video.
-
- -- Drew Parsons <[EMAIL PROTECTED]> Wed, 23 Aug 2006 01:00:52 +1000
+ xserver-xorg-core no longer Depends: xserver-xorg-video-all
+ | xserver-xorg-video but instead Conflicts: xserver-xorg-video.
+ The dependency on xserver-xorg-video-all | xserver-xorg-video-1.0 is
+ managed by the xserver-xorg binary package (not included here in
+ order to avoid circular dependencies).
+ * Likewise remove Depends: xserver-xorg-input-all | xserver-xorg-input
+ (again, handled by xserver-xorg) to avoid circular dependency with drivers.
+ -- Drew Parsons <[EMAIL PROTECTED]> Wed, 23 Aug 2006 01:20:41 +1000
+
xorg-server (1:1.1.1-3) unstable; urgency=low
* Add 16_s390_fix.diff to fix FTBFS on s390. Thanks Bastian Blank.
Modified: branches/7.1/xserver/xorg-server/debian/control
===================================================================
--- branches/7.1/xserver/xorg-server/debian/control 2006-08-22 15:14:18 UTC
(rev 2903)
+++ branches/7.1/xserver/xorg-server/debian/control 2006-08-22 15:24:35 UTC
(rev 2904)
@@ -13,7 +13,7 @@
Package: xserver-xorg-core
Architecture: any
-Depends: x11-common (>= 1:7.0.0), xserver-xorg-video-all |
xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input,
${shlibs:Depends}, ${misc:Depends}
+Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}
Recommends: xkb-data
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-xorg-video
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
