[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r1404 - branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian



Author: dnusinow
Date: 2006-03-06 21:35:54 -0500 (Mon, 06 Mar 2006)
New Revision: 1404

Modified:
   branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
   branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/control
Log:
* Version the conflict with xserver-xfree86 to allow for the transition
  package to be installed


Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog	2006-03-07 02:15:33 UTC (rev 1403)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog	2006-03-07 02:35:54 UTC (rev 1404)
@@ -16,8 +16,10 @@
     by Dann Frazier. Thanks to both of them. (closes: #353168)
   * Don't build xserver-xorg-core on s390. This means putting all the other
     arches as being explicitly listed. Damn !s390.
+  * Version the conflict with xserver-xfree86 to allow for the transition
+    package to be installed
 
- -- David Nusinow <dnusinow@debian.org>  Mon,  6 Mar 2006 21:14:00 -0500
+ -- David Nusinow <dnusinow@debian.org>  Mon,  6 Mar 2006 21:34:28 -0500
 
 xorg-server (1:1.0.1-1) experimental; urgency=low
 

Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/control
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/control	2006-03-07 02:15:33 UTC (rev 1403)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/control	2006-03-07 02:35:54 UTC (rev 1404)
@@ -14,8 +14,8 @@
 Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc sparc
 Depends: x11-common (>= 1:7.0.0), xserver-xorg-video-all | xserver-xorg-video, xserver-xorg-input-all | xserver-xorg-input, ${shlibs:Depends}, ${misc:Depends}
 Recommends: xkeyboard-config
-Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86
-Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
+Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
 Description: X.Org X server -- core server
  The X.Org X server is an X server for several architectures and operating
  systems, which is derived from the XFree86 4.x series of X servers.



Reply to: