debian/changelog | 8 ++++++++ debian/control | 2 +- debian/xserver-xorg.templates | 6 ++---- 3 files changed, 11 insertions(+), 5 deletions(-)
New commits: commit ad40898753c5bdc5d4fe5c14626d8a90c330816c Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Jun 8 18:21:12 2008 +0200 Re-add the xutils-dev dependency to xutils. There are still too many packages build-depending on xutils and expecting imake to be available. We'll drop it again after the lenny release. diff --git a/debian/changelog b/debian/changelog index dbc2bcd..61e7b62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ xorg (1:7.3+12) UNRELEASED; urgency=low * Don't recommend the 'sun' xkb rule set, they're handled by 'xorg' now, with the type4 and type5 models (closes: #483946). Thanks, Bernhard R. Link! + * Re-add the xutils-dev dependency to xutils. There are still too many + packages build-depending on xutils and expecting imake to be available. + We'll drop it again after the lenny release. -- Julien Cristau <[EMAIL PROTECTED]> Fri, 30 May 2008 23:06:42 +0200 diff --git a/debian/control b/debian/control index 3ba2280..b448a78 100644 --- a/debian/control +++ b/debian/control @@ -199,7 +199,7 @@ Description: miscellaneous X clients - metapackage Package: xutils Section: x11 Architecture: all -Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils, xfonts-utils +Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils, xfonts-utils, xutils-dev Description: X Window System utility programs metapackage xutils provides a set of utility programs shipped with the X Window System. Many of these programs are useful even on a system that does not have any X commit ff611eef4607018d3a7526aff31a102b881d5dfa Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Jun 8 18:07:25 2008 +0200 The only sane choice for xkbrules is xorg; sun is gone Don't recommend the 'sun' xkb rule set, they're handled by 'xorg' now, with the type4 and type5 models (closes: #483946). Thanks, Bernhard R. Link! diff --git a/debian/changelog b/debian/changelog index ce2a4f4..dbc2bcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ xorg (1:7.3+12) UNRELEASED; urgency=low * Debconf translations: - Belarusian. Closes: #483697 + [ Julien Cristau ] + * Don't recommend the 'sun' xkb rule set, they're handled by 'xorg' now, + with the type4 and type5 models (closes: #483946). Thanks, Bernhard R. + Link! + -- Julien Cristau <[EMAIL PROTECTED]> Fri, 30 May 2008 23:06:42 +0200 xorg (1:7.3+11) unstable; urgency=low diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates index 550f7f7..098824e 100644 --- a/debian/xserver-xorg.templates +++ b/debian/xserver-xorg.templates @@ -59,8 +59,7 @@ _Description: XKB rule set to use: For the X server to handle the keyboard correctly, an XKB rule set must be chosen. . - Users of most keyboards should enter "xorg". Users of Sun Type 4 and Type - 5 keyboards, however, should enter "sun". + Users of most keyboards should enter "xorg". . Experienced users can use any defined XKB rule set. If the xkb-data package has been unpacked, see the /usr/share/X11/xkb/rules directory for @@ -83,8 +82,7 @@ _Description: Keyboard model: - pc105: similar to pc104 and often found in Europe. Includes a "< >" key; - macintosh: Macintosh keyboards using the new input layer with Linux keycodes; - - macintosh_old: Macintosh keyboards not using the new input layer. - With the "sun" rule set: + - macintosh_old: Macintosh keyboards not using the new input layer; - type4: Sun Type4 keyboards; - type5: Sun Type5 keyboards. . -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]