Author: dnusinow
Date: 2005-10-06 19:54:04 -0500 (Thu, 06 Oct 2005)
New Revision: 668
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/control
branches/6.9/debian/x11-common.preinst.in
branches/6.9/debian/xserver-xorg.config.in
Log:
Merge changes from trunk between last merge -r655 and current HEAD (-r667)
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-10-07 00:42:50 UTC (rev 667)
+++ branches/6.9/debian/changelog 2005-10-07 00:54:04 UTC (rev 668)
@@ -103,8 +103,28 @@
-- David Nusinow <[EMAIL PROTECTED]> Thu, 8 Sep 2005 12:04:56 -0400
-xorg-x11 (6.8.2.dfsg.1-7+SVN) UNRELEASED; urgency=low
+xorg-x11 (6.8.2.dfsg.1-8+SVN) unstable; urgency=low
+ * debian/changelog: Changed references at bottom to xfree86-common to
+ x11-common, referring old changelogs.
+ * debian/control: Removed *a lot* (4 KB) of old legacy stuff like Conflicts:
+ with packages that are not in stable, some even in oldstable, or others
even
+ from before.
+
+ [ David Nusinow ]
+ * Back out change from last revision that reset all debconf questions with
+ "autodetect" in their name no matter what. This is unnecessary and only
+ 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 <[EMAIL PROTECTED]> Thu, 6 Oct 2005 20:40:25 -0400
+
+xorg-x11 (6.8.2.dfsg.1-8) unstable; urgency=low
+
[ Denis Barbier ]
* Modify setxkbmap and xkbcomp to look for XKB files in $XKBPATH if this
environment variable is set. This allows installing both xlibs and
@@ -113,7 +133,7 @@
are fixed (closes: #324768).
[ Christian Perrier ]
- * Updated Basque translation (zh_CN.po). Thanks, Piarres Beobide!
+ * Updated Basque translation (eu.po). Thanks, Piarres Beobide!
(closes: #327409).
* Updated Portuguese translation (pt.po). Thanks, Miguel Figueiredo!
(closes: #328878).
@@ -172,7 +192,7 @@
* Updated Czech translation (cs.po). Thanks, Miroslav Kure (closes:
#327506).
- -- David Nusinow <[EMAIL PROTECTED]> Tue, 4 Oct 2005 20:37:37 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 4 Oct 2005 22:24:17 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
@@ -295,7 +315,7 @@
via_mode.c.
* Updated debconf translations:
- Brazilian portuguese, thanks to André Luís Lopes (closes: #325150).
- - Danish, thanks to Claus Hindsgaul (closes #325583).
+ - Danish, thanks to Claus Hindsgaul (closes: #325583).
* debian/shell-lib.sh: It seems that a copy-paste type slipped in
6.8.2.dfsg.1-5, and the function replace_conffile_with_symlink_rollback
was not really included. xlibs upgrades from sarge were affected. Fixed
@@ -8785,11 +8805,11 @@
-- Branden Robinson <[EMAIL PROTECTED]> Sat, 28 Jul 2001 00:37:19 -0500
- See /usr/share/doc/xfree86-common/changelog.Debian.old.gz in the
- xfree86-common package for the remainder of this changelog.
+ See /usr/share/doc/x11-common/changelog.Debian.old.gz in the
+ x11-common package for the remainder of this changelog.
Changelog entries from some versions of the Ubuntu xfree86 and xorg packages
- can be found in /usr/share/doc/xfree86-common/changelog.Ubuntu.gz.
+ can be found in /usr/share/doc/x11-common/changelog.Ubuntu.gz.
$Id$
Modified: branches/6.9/debian/control
===================================================================
--- branches/6.9/debian/control 2005-10-07 00:42:50 UTC (rev 667)
+++ branches/6.9/debian/control 2005-10-07 00:54:04 UTC (rev 668)
@@ -299,8 +299,6 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: proxymngr
-Conflicts: xproxy
-Replaces: xproxy, xbase (<< 3.3.2.3a-2)
Description: Low Bandwidth X (LBX) proxy server
Applications that would like to take advantage of the Low Bandwidth extension
to X (LBX) must make their connections to an lbxproxy. These applications
@@ -619,8 +617,6 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: xlib6g (<< 4.0)
-Conflicts: xlib6g (<< 4.0)
Description: X Athena widget set library (version 6)
Xaw is a widget set based on the the Xt (X Toolkit Intrinsics) library. It
provides a set of graphical user-interface elements ("widgets") such as
@@ -638,8 +634,6 @@
Priority: extra
Architecture: any
Depends: libxaw6 (= ${Source-Version}), ${misc:Depends}
-Replaces: xlib6g (<< 4.0)
-Conflicts: xlib6g (<< 4.0)
Description: X Athena widget set library (version 6, unstripped)
This package is useful to provide a backtrace with symbol names in a
debugger; this facilitates interpretation of core dumps, and aids in finding
@@ -656,8 +650,8 @@
Priority: extra
Architecture: any
Depends: libxaw6 (= ${Source-Version}), x-dev, libxmu-dev, libxt-dev,
libsm-dev, libice-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw7-dev, libxaw8-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw7-dev, libxaw8-dev
+Conflicts: libxaw7-dev, libxaw8-dev
+Replaces: libxaw7-dev, libxaw8-dev
Description: X Athena widget set library development files (version 6)
Xaw header files and a static version of the Athena widget library are
provided by this package, which supports Xaw6-based clients.
@@ -709,8 +703,8 @@
Section: libdevel
Architecture: any
Depends: libxaw7 (= ${Source-Version}), x-dev, libxmu-dev, libxt-dev,
libsm-dev, libice-dev, libxext-dev, libx11-dev, libxp-dev, libxpm-dev,
libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev, libxaw8-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev, libxaw8-dev
+Conflicts: libxaw6-dev, libxaw8-dev
+Replaces: libxaw6-dev, libxaw8-dev
Provides: libxpm4-dev
Description: X Athena widget set library development files
Xaw header files, a static library, and a manual page documenting new
@@ -759,8 +753,8 @@
Section: libdevel
Architecture: any
Depends: libxaw8 (= ${Source-Version}), x-dev, libxmu-dev, libxt-dev,
libsm-dev, libice-dev, libxext-dev, libx11-dev, libxp-dev, libxpm-dev,
libc6-dev | libc-dev
-Conflicts: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev, libxaw7-dev
-Replaces: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev, libxaw7-dev
+Conflicts: libxaw6-dev, libxaw7-dev
+Replaces: libxaw6-dev, libxaw7-dev
Provides: libxpm4-dev
Description: X Athena widget set library development files
Xaw header files, a static library, and a manual page documenting new
@@ -1781,8 +1775,6 @@
Package: proxymngr
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xproxy
-Replaces: xproxy, xbase (<< 3.3.2.3a-2)
Description: X proxy services manager
proxymngr is responsible for resolving requests from xfindproxy (in the
xbase-clients package) and other similar clients, starting new proxies when
@@ -1791,7 +1783,6 @@
Package: twm
Architecture: any
Depends: menu (>> 1.5), ${shlibs:Depends}, ${misc:Depends}
-Replaces: xbase (<< 3.3.2.3a-2)
Provides: x-window-manager
Description: Tab window manager
twm is a window manager for the X Window System. It provides title bars,
@@ -1813,9 +1804,8 @@
Package: xbase-clients
Architecture: any
Depends: cpp, xlibs, xlibs-data, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap,
xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<<
3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3),
xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<=
3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<=
3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin, xlibs (<< 4.3.0),
cpp-3.3 (<< 1:3.3.3-0pre1)
-Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<<
4.0), xutils (<< 4.3.0.dfsg.1-6ubuntu1), xmodmap, xcontrib, xpm4g-dev, xpm-bin,
xsm
-Provides: xmodmap, xcontrib, xpm-bin, xsm
+Conflicts: xmodmap, xlibs (<< 4.3.0)
+Replaces: xutils (<< 4.3.0.dfsg.1-6ubuntu1)
Description: miscellaneous X clients
An X client is a program that interfaces with an X server (almost always via
the X libraries), and thus with some input and output hardware like a
@@ -1919,9 +1909,7 @@
Package: xdm
Architecture: any
Depends: debconf (>= 1.2.9) | debconf-2.0, xbase-clients, cpp, libpam-modules,
libpam-runtime (>= 0.76-13.1), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Suggests: xutils
-Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
Provides: x-display-manager
Description: X display manager
xdm manages a collection of X servers, which may be on the local host or
@@ -1956,11 +1944,8 @@
Package: xfonts-100dpi
Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xutils
Suggests: xfs | xserver
-Replaces: xfnt100
-Provides: xfnt100
-Conflicts: xfnt100, xbase-clients (<< 4.0)
Description: 100 dpi fonts for X
xfonts-100dpi provides a set of bitmapped fonts at 100 dots per inch. In
most cases it is desirable to have the X font server (xfs) and/or an X server
@@ -1980,10 +1965,8 @@
Package: xfonts-100dpi-transcoded
Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xutils
Suggests: xfs | xserver
-Conflicts: xbase-clients (<< 4.0), xfonts-biznet-iso-8859-2-100dpi (<<
3.0.0-10)
-Replaces: xfonts-100dpi (<< 4.1.0), xfnt100
Description: 100 dpi fonts for X (transcoded from ISO 10646-1)
xfonts-100dpi-transcoded provides a set of bitmapped fonts at 100 dots per
inch. In most cases it is desirable to have the X font server (xfs)
@@ -2003,11 +1986,8 @@
Package: xfonts-75dpi
Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xutils
Suggests: xfs | xserver
-Replaces: xfnt75
-Provides: xfnt75
-Conflicts: xfnt75, xbase-clients (<< 4.0)
Description: 75 dpi fonts for X
xfonts-75dpi provides a set of bitmapped fonts at 75 dots per inch. In most
cases it is desirable to have the X font server (xfs) and/or an X server
@@ -2027,10 +2007,8 @@
Package: xfonts-75dpi-transcoded
Architecture: all
-Depends: xutils (>> 4.0.3)
+Depends: xutils
Suggests: xfs | xserver
-Conflicts: xbase-clients (<< 4.0), xfonts-biznet-iso-8859-2-75dpi (<< 3.0.0-10)
-Replaces: xfonts-75dpi (<< 4.1.0), xfnt75
Description: 75 dpi fonts for X (transcoded from ISO 10646-1)
xfonts-75dpi-transcoded provides a set of bitmapped fonts at 75 dots per
inch. In most cases it is desirable to have the X font server (xfs)
@@ -2052,9 +2030,9 @@
Architecture: all
Replaces: xfntbase, xfntbig, xfonts-cjk
Provides: xfntbase, xfntbig, xfonts-cjk
-Depends: xutils (>> 4.0.3)
-Suggests: xfs, xserver
-Conflicts: xfntbase, xfonts-cjk, xbase-clients (<< 4.0)
+Depends: xutils
+Suggests: xfs | xserver
+Conflicts: xfntbase, xfonts-cjk
Description: standard fonts for X
xfonts-base provides a standard set of low-resolution bitmapped fonts. In
most cases it is desirable to have the X font server (xfs) and/or an X server
@@ -2078,10 +2056,9 @@
Package: xfonts-base-transcoded
Architecture: all
-Depends: xutils (>> 4.0.3)
-Suggests: xfs, xserver
-Conflicts: xbase-clients (<< 4.0), xfonts-biznet-iso-8859-2-base (<< 3.0.0-10)
-Replaces: xfonts-base (<< 4.1.0), xfntbase
+Depends: xutils
+Suggests: xfs | xserver
+Replaces: xfntbase
Description: standard fonts for X (transcoded from ISO 10646-1)
xfonts-base-transcoded provides a standard set of low-resolution bitmapped
fonts. In most cases it is desirable to have the X font server (xfs)
@@ -2098,9 +2075,9 @@
Architecture: all
Replaces: xfntcyr
Provides: xfntcyr
-Depends: xutils (>> 4.0.3)
+Depends: xutils
Suggests: xfs | xserver
-Conflicts: xfntcyr, xbase-clients (<< 4.0)
+Conflicts: xfntcyr
Description: Cyrillic fonts for X
xfonts-cyrillic provides a set of fonts using the Cyrillic alphabet for X
servers. In most cases it is desirable to have the X font server (xfs)
@@ -2113,9 +2090,9 @@
Architecture: all
Replaces: xfntscl
Provides: xfntscl
-Depends: xutils (>> 4.0.3)
+Depends: xutils
Suggests: xfs | xserver
-Conflicts: xfntscl, xbase-clients (<< 4.0)
+Conflicts: xfntscl
Description: scalable fonts for X
xfonts-scalable provides fonts that can be drawn at any size by the X server
or font server without loss of quality. In most cases it is desirable to
@@ -2134,8 +2111,8 @@
Architecture: all
Depends: debconf (>= 1.2.9) | debconf-2.0, debianutils (>= 1.13), lsb-base (>=
3.0-1)
Suggests: x-window-system-core | x-window-system
-Conflicts: xbase (<< 3.3.2.3a-2), task-x-window-system-core,
task-x-window-system, xfree86-common (<< 6.8.0), x-common
-Replaces: xbase (<< 3.3.2.3a-9), xlib6g-dev (<< 4.0), xmanpages (<< 3.3.4),
xstd, xserver-common (<< 4.0), xfree86-common (<< 6.8.0), x-common
+Conflicts: task-x-window-system-core, task-x-window-system, xfree86-common (<<
6.8.0), x-common
+Replaces: xfree86-common (<< 6.8.0), x-common
Provides: xfree86-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
@@ -2172,7 +2149,6 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-base, xfonts-scalable
-Replaces: xbase (<< 3.3.2.3a-2)
Description: X font server
xfs is a daemon that listens on a network port and serves X fonts to X
servers (and thus to X clients). All X servers have the ability to serve
@@ -2187,8 +2163,6 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: proxymngr
-Conflicts: xproxy
-Replaces: xproxy, xbase (<< 3.3.2.3a-2)
Description: X firewall proxy server
The X firewall proxy is an application layer gateway proxy that may be run
on a network firewall host to forward X traffic across the firewall. Used
@@ -2237,9 +2211,9 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: xlibmesa-dri
-Conflicts: libgl1, libutahglx1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
+Conflicts: libgl1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
Provides: libgl1
-Replaces: libgl1, libutahglx1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
+Replaces: libgl1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
Description: Mesa 3D graphics library [X.Org]
Mesa is a 3D graphics library which presents an API intended to be compatible
with OpenGL. X.Org maintains its own version of the Mesa library (which is
@@ -2273,9 +2247,9 @@
Section: libdevel
Architecture: any
Depends: xlibmesa-gl (= ${Source-Version}), x-dev, libxext-dev, libx11-dev,
libc6-dev | libc-dev
-Conflicts: libgl-dev, libutahglx-dev, xlibmesa-dev (<< 4.2.1-5)
+Conflicts: libgl-dev, xlibmesa-dev (<< 4.2.1-5)
Provides: libgl-dev
-Replaces: libgl-dev, libutahglx-dev, xlibmesa-dev (<< 4.2.1-5)
+Replaces: libgl-dev, xlibmesa-dev (<< 4.2.1-5)
Description: Mesa 3D graphics library development files [X.Org]
xlibmesa-gl-dev provides static versions of the libraries provided in
xlibmesa-gl, as well as header files and manual pages.
@@ -2286,9 +2260,9 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<<
4.2.1-5), xlibmesa3-glu, xlibmesa-glu
+Conflicts: libglu1c2, libglu1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5),
xlibmesa3-glu, xlibmesa-glu
Provides: libglu1c2, libglu1
-Replaces: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<<
4.2.1-5), xlibmesa3-glu, xlibmesa-glu
+Replaces: libglu1c2, libglu1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5),
xlibmesa3-glu, xlibmesa-glu
Description: Mesa OpenGL utility library [X.Org]
The OpenGL utility library (GLU) offers simple interfaces for building
mipmaps; checking for the presence of extensions in the OpenGL (or other
@@ -2324,9 +2298,9 @@
Section: libdevel
Architecture: any
Depends: libglu1-xorg (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev
-Conflicts: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev
(<< 4.2.1-5), xlibmesa-glu-dev
+Conflicts: libglu-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5),
xlibmesa-glu-dev
Provides: libglu-dev, xlibmesa-glu-dev
-Replaces: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<<
4.2.1-5), xlibmesa-glu-dev
+Replaces: libglu-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5),
xlibmesa-glu-dev
Description: Mesa OpenGL utility library development files [X.Org]
libglu1-xorg-dev provides static versions of the libraries provided in
libglu1-xorg, as well as header files and manual pages.
@@ -2381,8 +2355,6 @@
Section: libs
Architecture: all
Depends: libice6, libsm6, libx11-6, libxext6, libxi6, libxmu6, libxmuu1,
libxp6, libxpm4, libxrandr2, libxt6, libxtrap6, libxtst6, xlibs-data,
${misc:Depends}
-Conflicts: xbase, xlib, xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients
(<< 4.0), xcontrib (<< 4.0), xlib6g (<< 4.0), xlib6g-dev (<< 4.0), xsm (<< 4.0)
-Replaces: xbase, xlib, xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients
(<< 4.0), xcontrib (<< 4.0), xlib6g (<< 4.0), xlib6g-dev (<< 4.0), xsm (<< 4.0)
Description: X Window System client libraries metapackage and XKB data
This package smooths upgrades from Debian 3.0 by depending on the individual
library packages into which each shared object formerly contained in this
@@ -2399,7 +2371,7 @@
Section: libs
Priority: optional
Architecture: all
-Conflicts: xlibs (<< 4.3.0), xbase-clients (<< 4.3.0)
+Conflicts: xlibs (<< 4.3.0)
Replaces: xlibs (<< 4.3.0)
Description: X Window System client data
This package provides architecture-independent data for the X Window System,
@@ -2414,8 +2386,8 @@
Architecture: any
Depends: x-dev, libxext-dev, libxv-dev, libx11-dev, zlib1g-dev | libz-dev,
libc6-dev | libc-dev
Suggests: xspecs
-Conflicts: xdevel, xlib6g-dev (<< 4.0), xlib6g-static, xpm4g-dev, xmanpages,
libxfont-xtt-dev
-Replaces: xbase (<< 3.3.2.3a-2), xdevel, xpm4g-dev, xmanpages, xlib6g-dev (<<
4.0), xlib6g-static, libxfont-xtt-dev, xfs-xtt (<< 1:1.3.0.1-15)
+Conflicts: xmanpages
+Replaces: xmanpages
Provides: xmanpages
Description: X Window System client library development files
xlibs-static-dev provides static versions of the X Window System libraries
@@ -2453,7 +2425,6 @@
Package: xnest
Architecture: any
Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
-Replaces: xbase (<< 3.3.2.1-1)
Description: nested X server
Xnest is an X server that is itself an X client. This allows you to run a
server within a server; this is occasionally useful for testing new window
@@ -2465,8 +2436,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: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1),
suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35),
xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<<
3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35),
xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<<
3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3
(<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35),
xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<<
3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35),
xserver-xsun24 (<< 3.3.6-35), xserver-rage128, xserver-sis, xserver-xfree86
-Replaces: xbase (<< 3.3.2.3a-2), xserver-vga16 (<< 3.3.2.3a-2), xserver-agx
(<< 3.3.2.3a-9), xserver-mach32 (<< 3.3.2.3a-9), xserver-mach64 (<<
3.3.2.3a-9), xserver-p9000 (<< 3.3.2.3a-9), xserver-s3 (<< 3.3.2.3a-9),
xserver-s3v (<< 3.3.2.3a-9), xserver-tga (<< 3.3.2.3a-9), xserver-w32 (<<
3.3.2.3a-9), xsun-utils
+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
@@ -2484,13 +2454,19 @@
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), libxfont-xtt, xserver-xfree86
-Replaces: xserver-common (<< 4.0), libxfont-xtt, 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
The X.Org X server is an X server for several architectures and operating
@@ -2515,7 +2491,6 @@
Depends: xserver-common (>= ${Source-Version}), xserver-xorg
(=${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: xlibs, xserver-xorg, discover | discover1, mdetect, xresprobe,
laptop-detect
Conflicts: xlibs (<< 6.8.2.dfsg.1-5), libxfont-xtt
-Replaces: xserver-common (<< 4.0), libxfont-xtt
Provides: xserver, xserver-xorg
Description: debugging symbols for the X.Org X server
This package includes the debugging symbols useful for debugging the X.Org X
@@ -2524,7 +2499,6 @@
Package: xspecs
Architecture: all
-Conflicts: xbooks
Description: X protocol, extension, and library technical specifications
A comprehensive collection of manuals (most in HTML and PostScript as well as
text format, but some in text format only) documenting the standard
@@ -2591,8 +2565,8 @@
Architecture: any
Depends: x11-common (>= 6.8.1), cpp, ${shlibs:Depends}, ${misc:Depends}
Suggests: ssh | rsh-server, ssh | rsh-client, xlibs-data
-Conflicts: rstart, rstartd, xbase-clients (<< 6.8.2-4), xserver-common (<<
4.0), xbase (<< 3.3.2.3a-2), cpp-3.3 (<< 1:3.3.3-0pre1)
-Replaces: rstart, rstartd, xbase-clients (<< 6.8.2-4), xserver-common (<<
4.0), xfonts-base (<< 4.3.0.dfsg.1-6ubuntu1), xbase (<< 3.3.2.3a-2), xlibs-dev
(<< 4.1.0-12), xlib6g-dev (<< 4.0), dpsclient, xcontrib
+Conflicts: rstart, rstartd, xbase-clients (<< 6.8.2-4)
+Replaces: rstart, rstartd, xbase-clients (<< 6.8.2-4), xfonts-base (<<
4.3.0.dfsg.1-6ubuntu1), dpsclient
Description: X Window System utility programs
xutils provides a set of utility programs shipped with the X Window System
that do not require the X libraries; many of these programs are useful
@@ -2653,7 +2627,6 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: xbase-clients
-Replaces: xbase (<< 3.3.2.1-2)
Description: virtual framebuffer X server
Xvfb provides an X server that can run on machines with no display hardware
and no physical input devices. It emulates a dumb framebuffer using virtual
Modified: branches/6.9/debian/x11-common.preinst.in
===================================================================
--- branches/6.9/debian/x11-common.preinst.in 2005-10-07 00:42:50 UTC (rev
667)
+++ branches/6.9/debian/x11-common.preinst.in 2005-10-07 00:54:04 UTC (rev
668)
@@ -47,7 +47,7 @@
# been modified from the stable sarge version. If they have been modified,
we
# don't do anything, but if they are untouched then we remove them to let
the
# upgrade continue without errors
- if [ "$2" eq "" ]; then
+ if [ "$2" -eq "" ]; then
remove_conffile_prepare /etc/X11/Xresources/xfree86-common \
a0f3911120c49038cb87607e3c545b90
remove_conffile_prepare /etc/X11/Xsession \
Modified: branches/6.9/debian/xserver-xorg.config.in
===================================================================
--- branches/6.9/debian/xserver-xorg.config.in 2005-10-07 00:42:50 UTC (rev
667)
+++ branches/6.9/debian/xserver-xorg.config.in 2005-10-07 00:54:04 UTC (rev
668)
@@ -332,10 +332,6 @@
DEFAULT_ANSWER=$4
set +e
debug_echo "auto_answer() \"$INPUT_COMMAND $PRIORITY $TEMPLATE\" with
default \"$DEFAULT_ANSWER\""
- if echo $TEMPLATE | grep "autodetect" > /dev/null; then
- db_reset $TEMPLATE
- echo "auto_answer() resetting template $TEMPLATE"
- fi
db_fget "$TEMPLATE" seen
# are we re-configuring?
if [ -z "$FIRSTINST" ] && [ "$RET" = "true" ]; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
