Please find, for review, the debconf templates and packages descriptions of the xorg-server source package.
This review will last from Friday, August 31, 2007 to Monday, September 10, 2007. Please send reviews as unified diffs (diff -u) against the original files. Comments about your proposed changes will be appreciated. Your review should be sent as an answer to this mail. When appropriate, I will send intermediate requests for review, with "[RFRn]" (n>=2) as a subject tag. When we will reach a consensus, I send a "Last Chance For Comments" mail with "[LCFC]" as a subject tag. Finally, the reviewed templates will be sent to the package maintainer as a bug report, and a mail will be sent to this list with "[BTS]" as a subject tag. Rationale: --- ../xorg-server.old/debian/xprint-common.templates 2007-08-27 15:15:18.104056699 +0200 +++ debian/xprint-common.templates 2007-08-31 22:53:28.785523583 +0200 @@ -1,12 +1,12 @@ Template: xprint-common/default_printer_resolution Type: string Default: 600 -_Description: Default printer resolution - By default Xprint assumes a printer resolution of 600dpi. This should be fine - for the majority of printers today. +_Description: Default printer resolution: Use of prompts ended by colons is encouraged for string templates + By default, Xprint assumes a printer resolution of 600dpi. This should be + well suited for the majority of printers. adding a comma... "should be fine" sounds like familiar language to me... . On certain 1200dpi printers, however, the image might appear squashed in the corner of the page, or it might be blown up too large on 300dpi printers. If - you are experiencing these kinds of printing problems, you may want to set + you are experiencing such printing problems, you may want to set BetterĀ ? --- ../xorg-server.old/debian/control 2007-08-27 15:15:18.104056699 +0200 +++ debian/control 2007-08-31 22:52:39.788029944 +0200 @@ -43,7 +43,7 @@ Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common, fglrx-driver (<< 8.37.6) Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-common Provides: xserver -Description: X.Org X server -- core server +Description: X.Org X server - core server More common "typography" in such cases 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. . @@ -52,8 +52,8 @@ . The X.Org server either needs fonts installed on the local host, or needs to know of a remote hosts that provides font services (with xfs, for instance). - The former means that fonts packages are mandatory. The latter means that - font packages may be gratuitous. To err on the side of caution, install at + The former means that fonts packages are mandatory. The latter means that + font packages may be gratuitous. To err on the side of caution, install at Remove double spaces. Ditto on some other places in the same file - Use of the Xephyr X server instead of Xnest is recommended. + It is now mostly superseded by the Xephyr X server. This seems more direct to me, though maybe not perfect @@ -169,8 +169,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xbase-clients Description: Next Generation Nested X Server - xserver-xephyr is an X server that can be run inside another X server, - much like xnest. xephyr though, is based on the kdrive X server, and as a + The xephyr server is an X server that can be run inside another X server, + much like xnest. It is based on the kdrive X server, and as a Avoids sentences beginning with a lowercase lettre which is ugly @@ -179,14 +179,14 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>= 1:1.1) Recommends: xprint-utils Conflicts: xprt (<= 4.3.0.dfsg.1-10) -Description: Xprint - the X11 print system (binary) +Description: X11 print system (binary) repeating the package name in the description is discouraged The "the" then becomes discouraged style as well..:-) Xprint is an advanced printing system which enables X11 applications to use devices like printers, FAX or create documents in formats like PostScript, PDF, PCL, etc. . This package provides Xprt, the Xprint server compiled from - xprint.mozdev.org, an X.org subproject. Xprint provides superior support - for printing from mozilla, including non-latin characters and MathML. + xprint.mozdev.org, an X.org subproject. Xprint provides superior support + for printing from Mozilla, including non-latin characters and MathML. Capital for "Mozilla" - This package provides the configuration and postscript definition files + This package provides the configuration and Postscript definition files Capital for Postscript required to run Xprt, the Xprint server. Xprt is provided by xprint. Package: xserver-xorg-core-dbg @@ -216,5 +216,5 @@ The X.Org server supports most modern graphics hardware from most vendors, and supersedes all XFree86 X servers. . - This package provides debugging symbols for the Xorg X server and associated + This package provides debugging symbols for the X.org X server and associated Everywhere else, the server is mentioned as "the X.org X server".... I also would like to point the reference to the anonymous CVS which seems outdated to me, but I don't what should replace it.
Template: xprint-common/default_printer_resolution Type: string Default: 600 _Description: Default printer resolution: By default, Xprint assumes a printer resolution of 600dpi. This should be well suited for the majority of printers. . On certain 1200dpi printers, however, the image might appear squashed in the corner of the page, or it might be blown up too large on 300dpi printers. If you are experiencing such printing problems, you may want to set the default printer resolution to a more appropriate value. See /usr/share/doc/xprint-common/README.printing-problems.gz for more details.
--- ../xorg-server.old/debian/xprint-common.templates 2007-08-27 15:15:18.104056699 +0200 +++ debian/xprint-common.templates 2007-08-31 22:53:28.785523583 +0200 @@ -1,12 +1,12 @@ Template: xprint-common/default_printer_resolution Type: string Default: 600 -_Description: Default printer resolution - By default Xprint assumes a printer resolution of 600dpi. This should be fine - for the majority of printers today. +_Description: Default printer resolution: + By default, Xprint assumes a printer resolution of 600dpi. This should be + well suited for the majority of printers. . On certain 1200dpi printers, however, the image might appear squashed in the corner of the page, or it might be blown up too large on 300dpi printers. If - you are experiencing these kinds of printing problems, you may want to set + you are experiencing such printing problems, you may want to set the default printer resolution to a more appropriate value. See /usr/share/doc/xprint-common/README.printing-problems.gz for more details. --- ../xorg-server.old/debian/control 2007-08-27 15:15:18.104056699 +0200 +++ debian/control 2007-08-31 22:52:39.788029944 +0200 @@ -43,7 +43,7 @@ Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common, fglrx-driver (<< 8.37.6) Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-common Provides: xserver -Description: X.Org X server -- core server +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. . @@ -52,8 +52,8 @@ . The X.Org server either needs fonts installed on the local host, or needs to know of a remote hosts that provides font services (with xfs, for instance). - The former means that fonts packages are mandatory. The latter means that - font packages may be gratuitous. To err on the side of caution, install at + The former means that fonts packages are mandatory. The latter means that + font packages 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. . @@ -67,7 +67,7 @@ Package: xserver-xorg-dev Architecture: any Depends: ${misc:Depends} -Description: X.Org X server -- development files +Description: X.Org X server - development files This package provides development files for the X.Org ('Xorg') X server. This is not quite the same as the DDK (Driver Development Kit) from the XFree86 4.x and X.Org 6.7, 6.8 and 6.9 series of servers; it provides @@ -89,12 +89,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Description: Distributed Multihead X server Xdmx is a proxy X server that uses one or more other X servers as its - display device(s). It provides multi-head X functionality for displays that - might be located on different machines. Xdmx functions as a front-end X server - that acts as a proxy to a set of back-end X servers. All of the visible - rendering is passed to the back-end X servers. Clients connect to the Xdmx + display device(s). It provides multi-head X functionality for displays that + might be located on different machines. Xdmx functions as a front-end X server + that acts as a proxy to a set of back-end X servers. All of the visible + rendering is passed to the back-end X servers. Clients connect to the Xdmx front-end, and everything appears as it would in a regular multi-head - configuration. If Xinerama is enabled (e.g., with +xinerama on the command + configuration. If Xinerama is enabled (e.g., with +xinerama on the command line), the clients see a single large screen. . More information about X.Org can be found at: @@ -124,11 +124,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Description: Nested X server Xnest is a nested X server that simply relays all its requests to another - X server, where it runs as a client. This means that it appears as another - window in your current X session. Xnest relies upon its parent X server + X server, where it runs as a client. This means that it appears as another + window in your current X session. Xnest relies upon its parent X server for font services. . - Use of the Xephyr X server instead of Xnest is recommended. + It is now mostly superseded by the Xephyr X server. . More information about X.Org can be found at: <URL:http://xorg.freedesktop.org> @@ -143,8 +143,8 @@ Recommends: xbase-clients, xfonts-base Description: Virtual Framebuffer 'fake' 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 - memory. The primary use of this server was intended to be server testing, + and no physical input devices. It emulates a dumb framebuffer using virtual + memory. The primary use of this server was intended to be server testing, but other novel uses for it have been found, including testing clients against unusual depths and screen configurations, doing batch processing with Xvfb as a background rendering engine, load testing, as an aid to porting the @@ -154,7 +154,7 @@ . This package also contains a convenience script called xvfb-run which simplifies the automated execution of X clients in a virtual server - environment. This convenience script requires the use of the xauth + environment. This convenience script requires the use of the xauth program. . More information about X.Org can be found at: @@ -169,8 +169,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xbase-clients Description: Next Generation Nested X Server - xserver-xephyr is an X server that can be run inside another X server, - much like xnest. xephyr though, is based on the kdrive X server, and as a + The xephyr server is an X server that can be run inside another X server, + much like xnest. It is based on the kdrive X server, and as a result it supports newer extensions than xnest, including render and composite. @@ -179,14 +179,14 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>= 1:1.1) Recommends: xprint-utils Conflicts: xprt (<= 4.3.0.dfsg.1-10) -Description: Xprint - the X11 print system (binary) +Description: X11 print system (binary) Xprint is an advanced printing system which enables X11 applications to use devices like printers, FAX or create documents in formats like PostScript, PDF, PCL, etc. . This package provides Xprt, the Xprint server compiled from - xprint.mozdev.org, an X.org subproject. Xprint provides superior support - for printing from mozilla, including non-latin characters and MathML. + xprint.mozdev.org, an X.org subproject. Xprint provides superior support + for printing from Mozilla, including non-latin characters and MathML. TrueType fonts are supported. . Xprint uses ttf2pt1 internally for some font support. @@ -197,12 +197,12 @@ Recommends: xprint, xfonts-base Conflicts: xprt-common Replaces: xprt-common -Description: Xprint - the X11 print system (configuration files) +Description: X11 print system (configuration files) Xprint is an advanced printing system which enables X11 applications to use devices like printers, FAX or create documents in formats like PostScript, PDF, PCL, etc. . - This package provides the configuration and postscript definition files + This package provides the configuration and Postscript definition files required to run Xprt, the Xprint server. Xprt is provided by xprint. Package: xserver-xorg-core-dbg @@ -216,5 +216,5 @@ The X.Org server supports most modern graphics hardware from most vendors, and supersedes all XFree86 X servers. . - This package provides debugging symbols for the Xorg X server and associated + This package provides debugging symbols for the X.org X server and associated modules.
Source: xorg-server Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Steve Langasek <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>, Drew Parsons <[EMAIL PROTECTED]> # all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg # server, and common dependencies for the DIX. # x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server. # x11proto-print-dev and libfreetype6-dev are for Xprint # everything on is for the DMX and Xnest servers. Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex, x11proto-bigreqs-dev, x11proto-composite-dev (>= 0.3), x11proto-core-dev, x11proto-damage-dev (>= 1.1), x11proto-evie-dev, x11proto-fixes-dev (>= 4.0), x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>= 1.2), x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1), x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1), libxdmcp-dev (>= 1:0.99.1-1), libxfont-dev, libfontenc-dev, libxkbfile-dev (>= 1:0.99.1-1), x11proto-xf86dri-dev, libdrm-dev (>= 2.3.0) [!hurd-i386], x11proto-print-dev, libfreetype6-dev, xfonts-utils, mesa-swx11-source (>= 6.5.3), x11proto-gl-dev (>= 1.4.8), libgl1-mesa-dev (>= 6.5.1), libxmuu-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1), libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1), libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1-1), libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1), libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1), libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1), libxfixes-dev (>= 1:3.0.0) Build-Conflicts: xlibs-static-dev Standards-Version: 3.7.2.0 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git Package: xserver-xorg-core Architecture: any Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg Recommends: xkb-data, xfonts-base Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common, fglrx-driver (<< 8.37.6) Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-common Provides: xserver 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. . The X.Org server supports most modern graphics hardware from most vendors, and supersedes all XFree86 X servers. . The X.Org server either needs fonts installed on the local host, or needs to know of a remote hosts that provides font services (with xfs, for instance). The former means that fonts packages are mandatory. The latter means that font packages 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. . More information about X.Org can be found at: <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This module can be found as the module 'xserver/xorg' at :pserver:[EMAIL PROTECTED]:/cvs/xorg Package: xserver-xorg-dev Architecture: any Depends: ${misc:Depends} Description: X.Org X server - development files This package provides development files for the X.Org ('Xorg') X server. This is not quite the same as the DDK (Driver Development Kit) from the XFree86 4.x and X.Org 6.7, 6.8 and 6.9 series of servers; it provides headers and a pkg-config file for drivers using autotools to build against. . Unless you are developing or building a driver, you probably want xserver-xorg and/or xserver-xorg-core instead. . More information about X.Org can be found at: <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This module can be found as the module 'xserver/xorg' at :pserver:[EMAIL PROTECTED]:/cvs/xorg Package: xdmx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Distributed Multihead X server Xdmx is a proxy X server that uses one or more other X servers as its display device(s). It provides multi-head X functionality for displays that might be located on different machines. Xdmx functions as a front-end X server that acts as a proxy to a set of back-end X servers. All of the visible rendering is passed to the back-end X servers. Clients connect to the Xdmx front-end, and everything appears as it would in a regular multi-head configuration. If Xinerama is enabled (e.g., with +xinerama on the command line), the clients see a single large screen. . More information about X.Org can be found at: <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This module can be found as the module 'xserver/xorg' at :pserver:[EMAIL PROTECTED]:/cvs/xorg Package: xdmx-tools Architecture: any Depends: xdmx, ${shlibs:Depends}, ${misc:Depends} Replaces: xdmx (<= 2:1.1.1-10) Description: Distributed Multihead X tools This package provides a collection of tools used for administration of the Xdmx server; see the xdmx package for more information. . More information about X.Org can be found at: <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This module can be found as the module 'xserver/xorg' at :pserver:[EMAIL PROTECTED]:/cvs/xorg Package: xnest Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Nested X server Xnest is a nested X server that simply relays all its requests to another X server, where it runs as a client. This means that it appears as another window in your current X session. Xnest relies upon its parent X server for font services. . It is now mostly superseded by the Xephyr X server. . More information about X.Org can be found at: <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This module can be found as the module 'xserver/xorg' at :pserver:[EMAIL PROTECTED]:/cvs/xorg Package: xvfb Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xbase-clients, xfonts-base Description: Virtual Framebuffer 'fake' 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 memory. The primary use of this server was intended to be server testing, but other novel uses for it have been found, including testing clients against unusual depths and screen configurations, doing batch processing with Xvfb as a background rendering engine, load testing, as an aid to porting the X server to a new platform, and providing an unobtrusive way to run applications that don't really need an X server but insist on having one anyway. . This package also contains a convenience script called xvfb-run which simplifies the automated execution of X clients in a virtual server environment. This convenience script requires the use of the xauth program. . More information about X.Org can be found at: <URL:http://xorg.freedesktop.org> <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This module can be found as the module 'xserver/xorg' at :pserver:[EMAIL PROTECTED]:/cvs/xorg Package: xserver-xephyr Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: xbase-clients Description: Next Generation Nested X Server The xephyr server is an X server that can be run inside another X server, much like xnest. It is based on the kdrive X server, and as a result it supports newer extensions than xnest, including render and composite. Package: xprint Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>= 1:1.1) Recommends: xprint-utils Conflicts: xprt (<= 4.3.0.dfsg.1-10) Description: X11 print system (binary) Xprint is an advanced printing system which enables X11 applications to use devices like printers, FAX or create documents in formats like PostScript, PDF, PCL, etc. . This package provides Xprt, the Xprint server compiled from xprint.mozdev.org, an X.org subproject. Xprint provides superior support for printing from Mozilla, including non-latin characters and MathML. TrueType fonts are supported. . Xprint uses ttf2pt1 internally for some font support. Package: xprint-common Architecture: all Depends: xbase-clients, xfonts-encodings, x11-common (>= 1:7.0.12), ${shlibs:Depends}, ${misc:Depends} Recommends: xprint, xfonts-base Conflicts: xprt-common Replaces: xprt-common Description: X11 print system (configuration files) Xprint is an advanced printing system which enables X11 applications to use devices like printers, FAX or create documents in formats like PostScript, PDF, PCL, etc. . This package provides the configuration and Postscript definition files required to run Xprt, the Xprint server. Xprt is provided by xprint. Package: xserver-xorg-core-dbg Architecture: any Depends: xserver-xorg-core (= ${Source-Version}) Priority: extra Description: Xorg - the X.Org X server (debugging symbols) 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. . The X.Org server supports most modern graphics hardware from most vendors, and supersedes all XFree86 X servers. . This package provides debugging symbols for the X.org X server and associated modules.
signature.asc
Description: Digital signature