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

X Strike Force X.Org X11 SVN commit: r667 - trunk/debian



Author: dnusinow
Date: 2005-10-06 19:42:50 -0500 (Thu, 06 Oct 2005)
New Revision: 667

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
* Add transitional xserver-xfree86 package that merely depends on
  xserver-xorg. Make all conflicts with xserver-xfree86 be on
  pre-6.8.2.dfsg.1-1 packages. Thanks Adrian Davey. (closes: #332414)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-10-07 00:00:11 UTC (rev 666)
+++ trunk/debian/changelog	2005-10-07 00:42:50 UTC (rev 667)
@@ -12,8 +12,11 @@
     lead to annoyances. (closes: #332336)
   * Add missing '-' before 'eq' in x11-common.preinst.in. Thanks Matthias
     Heinz. (closes: #332341)
+  * Add transitional xserver-xfree86 package that merely depends on
+    xserver-xorg. Make all conflicts with xserver-xfree86 be on
+    pre-6.8.2.dfsg.1-1 packages. Thanks Adrian Davey. (closes: #332414)
 
- -- David Nusinow <dnusinow@debian.org>  Thu,  6 Oct 2005 19:58:44 -0400
+ -- David Nusinow <dnusinow@debian.org>  Thu,  6 Oct 2005 20:40:25 -0400
 
 xorg-x11 (6.8.2.dfsg.1-8) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-10-07 00:00:11 UTC (rev 666)
+++ trunk/debian/control	2005-10-07 00:42:50 UTC (rev 667)
@@ -2474,7 +2474,7 @@
 Architecture: any
 Depends: debconf (>= 1.0.21) | debconf-2.0, x11-common (>= 6.8.1), ${shlibs:Depends}, ${misc:Depends}
 Suggests: xserver-xorg | xserver, xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable, configlet-frontends
-Conflicts: xserver-xfree86
+Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1)
 Description: files and utilities common to all X servers
  The X server is the hardware interface of the X Window System.  Its job is to
  communicate with video display and input devices, and present them in a
@@ -2492,12 +2492,18 @@
  may be gratuitous.  To err on the side of caution, install at least the
  xfonts-base, xfonts-100dpi or xfonts-75dpi, and xfonts-scalable packages.
 
+Package: xserver-xfree86
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc sparc
+Depends: xserver-xorg
+Description: transitional package for moving from xfree86 to X.Org
+ This package smooths upgrades from Debian 3.1 by depending on xserver-xorg.
+
 Package: xserver-xorg
 Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc sparc
 Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: xlibs, discover | discover1, mdetect, xresprobe (>= 0.4.13), laptop-detect
 Suggests: libglide2 (>> 2001.01.26)
-Conflicts: xlibs (<< 6.8.2.dfsg.1-5), xserver-xfree86
+Conflicts: xlibs (<< 6.8.2.dfsg.1-5), xserver-xfree86 (<< 6.8.2.dfsg.1-1)
 Replaces: xserver-xfree86
 Provides: xserver
 Description: the X.Org X server



Reply to: