Author: dnusinow Date: 2006-03-19 23:57:39 -0500 (Sun, 19 Mar 2006) New Revision: 1477
Modified: branches/modular/debian/xorg/debian/changelog branches/modular/debian/xorg/debian/control Log: * Have xserver-xorg conflict and replace xserver-common. Thanks Miles Bader. (closes: #356781) Modified: branches/modular/debian/xorg/debian/changelog =================================================================== --- branches/modular/debian/xorg/debian/changelog 2006-03-20 04:55:09 UTC (rev 1476) +++ branches/modular/debian/xorg/debian/changelog 2006-03-20 04:57:39 UTC (rev 1477) @@ -1,3 +1,10 @@ +xorg (1:7.0.5) experimental; urgency=low + + * Have xserver-xorg conflict and replace xserver-common. Thanks Miles Bader. + (closes: #356781) + + -- David Nusinow <[EMAIL PROTECTED]> Sun, 19 Mar 2006 23:57:10 -0500 + xorg (1:7.0.4) experimental; urgency=low * Name rgb.txt symlink properly so that the xserver actually finds it. Modified: branches/modular/debian/xorg/debian/control =================================================================== --- branches/modular/debian/xorg/debian/control 2006-03-20 04:55:09 UTC (rev 1476) +++ branches/modular/debian/xorg/debian/control 2006-03-20 04:57:39 UTC (rev 1477) @@ -25,7 +25,8 @@ Package: xserver-xorg Architecture: all -Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1) +Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common +Replaces: xserver-common Pre-Depends: x11-common (>= 7.0.0-0ubuntu3) Depends: xserver-xorg-core, xserver-xorg-video-all | xserver-xorg-video, xserver-xorg-input-all | xserver-xorg-input, laptop-detect, xresprobe, mdetect, discover1, debconf Description: the X.Org X server -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
