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

X Strike Force X.Org X11 SVN commit: r868 - branches/6.9/debian



Author: dnusinow
Date: 2005-11-13 11:40:50 -0500 (Sun, 13 Nov 2005)
New Revision: 868

Modified:
   branches/6.9/debian/changelog
   branches/6.9/debian/control
Log:
* Remove replaces and conflicts in xdmx package that were for internal
  testing. Thanks to Steve Langasek and Daniel Stone.


Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog	2005-11-13 16:29:11 UTC (rev 867)
+++ branches/6.9/debian/changelog	2005-11-13 16:40:50 UTC (rev 868)
@@ -10,8 +10,10 @@
       - general/002_xdm_fixes.diff (mostly remove whitespace-only changes)
       - debian/904_debian_xinitrc.diff
       - debian/905_debian_xdm.diff
+  * Remove replaces and conflicts in xdmx package that were for internal
+    testing. Thanks to Steve Langasek and Daniel Stone.
 
- -- David Nusinow <dnusinow@debian.org>  Sun, 13 Nov 2005 11:08:28 -0500
+ -- David Nusinow <dnusinow@debian.org>  Sun, 13 Nov 2005 11:37:53 -0500
 
 xorg-x11 (6.8.99.901.dfsg.1-2) experimental; urgency=low
 

Modified: branches/6.9/debian/control
===================================================================
--- branches/6.9/debian/control	2005-11-13 16:29:11 UTC (rev 867)
+++ branches/6.9/debian/control	2005-11-13 16:40:50 UTC (rev 868)
@@ -1931,8 +1931,6 @@
 Package: xdmx
 Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc s390 sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xserver-xorg (<= 6.8.1-0.2)
-Replaces: xserver-xorg (<= 6.8.1-0.2)
 Description: Distributed Multi-head X server
  Xdmx is a proxy X server that uses one or more other X servers as its display
  devices.  It provides multi-head X functionality for displays that might be



Reply to: