debian/changelog | 1128 ++++++++++++++++++++++++++++++++++++++++ debian/control | 6 debian/local/dexconf | 1 debian/xserver-xorg.postinst.in | 19 debian/xserver-xorg.prerm.in | 19 5 files changed, 1146 insertions(+), 27 deletions(-)
New commits: commit d5b092c70aa6793ba23579028898828c8a9d8606 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Mon Nov 19 18:07:14 2007 +0200 Bring back old changelog entries and prepare it for upload. diff --git a/debian/changelog b/debian/changelog index 9b4a59a..207e528 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,8 +47,9 @@ xorg (1:7.3+6ubuntu1) hardy; urgency=low cards still require weird overrides (ati -> fbdev) that are not 100% known in all combinations. + Skip video card autodetection if xforcevesa is set. + * Bring back old changelog entries. - -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 08 Nov 2007 08:12:20 +0200 + -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 19 Nov 2007 18:05:43 +0200 xorg (1:7.3+6) unstable; urgency=low @@ -285,6 +286,254 @@ xorg (1:7.2-6) UNRELEASED; urgency=low -- Brice Goglin <[EMAIL PROTECTED]> Sat, 11 Aug 2007 19:06:20 +0200 +xorg (1:7.2-5ubuntu13) gutsy; urgency=low + + * debian/local/Failsafe/failsafeXServer: + + Change next to continue (closes LP: #149304) + * debian/local/Failsafe/failsafeXinit: + + Fix typo s/XORGCONF/XORGCONFIG/ + + -- Bryce Harrington <[EMAIL PROTECTED]> Sun, 07 Oct 2007 09:56:15 -0700 + +xorg (1:7.2-5ubuntu12) gutsy; urgency=low + + * Add a dependency to x11-common for each binary built. + * Symlink the doc directories to x11-common, explicitely remove the doc + directories on upgrade for the now symlinked doc directories. + + -- Matthias Klose <[EMAIL PROTECTED]> Fri, 05 Oct 2007 20:28:33 +0200 + +xorg (1:7.2-5ubuntu11) gutsy; urgency=low + + * debian/local/Failsafe/failsafeXinit: Switch to use of new + 'xfailsafedialog' script instead of displayconfig-gtk + (closes LP: #146186) + * debian/local/Failsafe/failsafeXServer: + + Use :10 instead of :0 to avoid overwriting the (failed) + Xorg.0.log. (Temporary but regression-safe fix for 148122) + + Add failure logging, so we can track past failures and avoid + re-running Bulletproof-X if it's already proven unable to fix the + issue. In this (rare but possible) case, we'll just get out of + the way and let gdm handle it. (closes LP: #146603) + * Drop debian/local/Failsafe/failsafeInstall as it is no longer used + * debian/local/dexconf: Fix problem preventing touchpad scrolling + from being able to be enabled by switching HorizEdgeDelta for + HorizEdgeScroll, as suggested by Matthew Garrett). + (closes LP: #147249, and probably many more.) + + -- Bryce Harrington <[EMAIL PROTECTED]> Thu, 04 Oct 2007 03:30:32 -0700 + +xorg (1:7.2-5ubuntu10) gutsy; urgency=low + + * debian/local/dexconf: Removing static wacom entries [Closes: LP# 83860] + + -- Bryce Harrington <[EMAIL PROTECTED]> Mon, 17 Sep 2007 10:33:51 -0700 + +xorg (1:7.2-5ubuntu9) gutsy; urgency=low + + * debian/control: Add Recommends for displayconfig-gtk + * debian/local/Failsafe/: + - Fix issue where debconf smooshes together stdout and stderr + which resulted in issue where if any warning msgs are generated, + they end up in the xorg.conf.failsafe. + - Fix issue discovered in testing that it is difficult to override + defaults in failsafeXserver, by making several parameters + configurable as environment variables. + - Fix issue when running failsafeXserver directly, not through gdm, + where SIGSTOP was emitted to the parent process. Now only do this + if the parent process is gdm. + - Fix issue on hardware that can't do DRI. We had been unable to + forcibly "Disable" DRI and other modules because guidance would + crash on presence of this parameter in xorg.conf's. Now that + guidance is patched with this, we can safely use it to solve this + issue. + - Add warning dialog if displayconfig-gtk is not installed. + + -- Bryce Harrington <[EMAIL PROTECTED]> Fri, 7 Sep 2007 15:00:41 -0700 + +xorg (1:7.2-5ubuntu8) gutsy; urgency=low + + * debian/local/Failsafe/failsafeXServer: Fix bug where gdm would + attempt to manage the display while in failsafe mode, interrupting + the user. Now we shutdown gdm while in failsafe mode, and restart + after we're finished. + + -- Bryce Harrington <[EMAIL PROTECTED]> Tue, 4 Sep 2007 19:10:53 -0700 + +xorg (1:7.2-5ubuntu7) gutsy; urgency=low + + * debian/scripts/vars.i386: Enabling xserver-xorg-video-amd as + depends, as MIR has cleared and it's now in main. (LP: #130717) + * debian/local/Failsafe/*: + - Remove failsafe xorg.conf statements that guidance doesn't + understand yet (e.g. Module>Disable) + - Omit BUSID when debconf fails to discover it + - Correct quotes for DISPLAY_MODES in failsafe xorg.conf + - Add some error detection/reporting for failsafe xorg.conf generation + - Add gksu for running displayconfig-gtk + + -- Bryce Harrington <[EMAIL PROTECTED]> Fri, 24 Aug 2007 16:34:45 -0700 + +xorg (1:7.2-5ubuntu6) gutsy; urgency=low + + * debian/scripts: Dropping xserver-xorg-video-amd as depends until MIR + clears. + + -- Bryce Harrington <[EMAIL PROTECTED]> Thu, 16 Aug 2007 14:47:05 -0700 + +xorg (1:7.2-5ubuntu5) gutsy; urgency=low + + * debian/scripts: Add xserver-xorg-video-amd and + xserver-xorg-video-psb to xserver-xorg-video-all. (LP: #130717) + * debian/local/Failsafe/failsafeDexconf: script (based on dexconf) to + generate a failsafe xorg.conf with hardcoded values for driver + ("vesa"), refresh rates, and so forth. Disables several modules + that can sometimes cause problems (dri, glx, etc.) Still uses + debconf for keyboard, mouse, etc. + * debian/local/Failsafe/failsafeXServer: using a static + /etc/X11/xorg.conf.failsafe rather than a tmp file, so that + displayconfig-gtk can reuse the file if user wishes. + * debian/local/Failsafe/failsafeHelpmesg: dropped; this is now + available in python through displayconfig-gtk in a much less hacky + manner. + * debian/control: Drop xserver-xorg-video-all and + xserver-xorg-input-all as Recommends, since these are already + listed as the first default for Depends. + + -- Bryce Harrington <[EMAIL PROTECTED]> Thu, 16 Aug 2007 12:26:39 -0700 + +xorg (1:7.2-5ubuntu4) gutsy; urgency=low + + * Stop handling -config specifically in the wrapper, as Xorg now handles + this itself. + + -- Tollef Fog Heen <[EMAIL PROTECTED]> Fri, 10 Aug 2007 09:12:13 +0200 + +xorg (1:7.2-5ubuntu3) gutsy; urgency=low + + * debian/local/dexconf: fix the Display-subsection generation + (LP: 130094). + + -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 3 Aug 2007 15:20:41 +0300 + +xorg (1:7.2-5ubuntu2) gutsy; urgency=low + + * debian/scripts/vars.lpia: Copied from vars.i386. + + -- Matthias Klose <[EMAIL PROTECTED]> Thu, 02 Aug 2007 08:57:30 +0000 + +xorg (1:7.2-5ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control, debian/scripts/vars.sparc, debian/rules: + + Makes xorg Architecture: any and use an extra variable + to not Depends on type-handling. + - debian/control: + + Keep meta-packages for xbase-clients, xutils. + + Change the Maintainer-field. + + Add replaces for xinit since we now ship Xsession from x11-common. + Ditto for xrgb as we ship rgb.txt in x11-common. + + xserver-xorg: Add dependancy "OR xserver-xorg-video" because + the restricted drivers provide that. + + Drop dependency on "sparc-utils | not+sparc" + + Move xorg-docs Depends to Suggests, because xorg-docs is in + universe. + - debian/local/Xsession: + + If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last + 0.5MiB to avoid having it grow indefinitively. (This does not happen + with gdm anyway since gdm cleans the file on login). (LP #60448) + - debian/local/dexconf: + + Unconditionally re-enable ZAxisMapping in dexconf. (LP #31827) + + Add InputDevice entries for wacom. + + Add extra bits for ps3fb xorg.conf. + + Read xserver-xorg/config/device/extra_options key, parse it + (first token is option name, rest of the line after first space + is value), and add it as Option lines to the device section. + (LP #90109) + + Add special case for i810 with 3M TouchScreen monitors to set a + resolution of 800x600 and avoid probing since it will fail miserably + in xserver-xorg.postinst. Also make sure to write Option "DisplayInfo" + "False" in Device Section in dexconf if the above combination is + matched otherwise the card will display extra unrequired info each + time X attempts a startup. (touches also xserver-xorg.postinst.in) + + Due to a very annoying DRI/DRM bug, make sure to use OldDmaInit + when writing down the Device section for mga driver. This will make + DRI work at least for AGP cards. PCI didn't work before and it will + keep not working since the option does explicitly disable DRI for PCI. + (LP #27442) + + Enable elographics driver when matching known machines. + + Disable composite when using the fglrx driver. It does not support + composition, and enabling it by default (as recently done in + xorg-server) breaks DRI for fglrx. (LP #90688) + - debian/scripts/vars.i386: + + Add xserver-xorg-input-elographics to XSERVER_XORG_INPUT_DEPENDS. + - debian/xserver-xorg.postinst.in: + + Add lt to list of non-Latin keymaps (LP #38931). + + Make sure to ask video driver on sparc even if autodetected. Some + cards still require weird overrides (ati -> fbdev) that are not + 100% known in all combinations. + + Skip video card autodetection if xforcevesa is set + (LP #27020, #59618). + + Detect keyboard layout configuration using /etc/default/console-setup + if available. + + Clean up duplicate keymaps in xserver-xorg.config.in and make sure + they're all neatly alphabetised. + + Map cf console keymap to ca(fr). + + Map croat console keymap to hr. (LP #43598) + + Set default keyboard variant for French to oss (LP #89835). + + Map et console keymap to ee. (LP #42800) + + Map mk console keymap to mk. + + Map nl console keymap to nl. (LP #26552) + + Map ru console keymap to ru. + + Map slovene console keymap to si. (LP #27509) + + Map sr-cy console keymap to map to cs, not sr, following + xkeyboard-config changes. + + Handle trfu/trqu console keymaps the same way as trf/trq. + (LP #37867) + + Map uk console keymap to gb, not gb(intl). (LP #58016) + + Try autodetecting South Korean keyboards. They have to be detected + from LANG since they use US keymaps on the console. + + Fix sanity-checking logic for French Canadian vs. US-layout + keyboards. (LP #34627) + + Sparc doesn't need sun types keyboard since 2.6 kernel come to play + in the game. Make it use pc105 instead with xorg rules. + + Use fbset for HPPA. + + Write down sync ranges for sis driver. Too many reports on sis driver + not being able to get a clue on the connected monitor. (LP #30489) + + Some ati cards require a kick (sync ranges) when using DVI output. + (LP #39570) + + Make sure to write sync values for Intel Corporation 82852/855GM + Integrated Graphics Device when monitor is LCV/LDVS. + (LP #13846) + + Write sync values for Intel Mobile 945GM. (LP #62002) + + Make sure to write sync ranges with CTX S501A LCD monitor since it + seems to return 2 sets of sync ranges but only one is valid and of + course the drivers pick up the wrong one. (LP #38772) + + On fresh installs, if the display is not a lcd/lvds, there are no + known syncs frequencies for the monitor and the card is mga, do NOT + write SYNC_RANGES. It appears that mga can cope just fine parting + vesa info too. (LP #19098) + - debian/xserver-xorg.templates: + + Add xserver-xorg/config/device/extra_options so that extra graphics + driver options can be set through debconf and respected by dexconf. + We need this in restricted-manager to make restricted drivers like + nvidia work OOTB for compiz, but it is certainly useful for other + things, too. (NB that the question is never asked interactively). + - debian/apport/xorg-server.py, debian/x11-common.install: apport + hook for xorg-server crashes. + - debian/scripts/vars.{i386,amd64}: + Install both xserver-xorg-video-intel AND xserver-xorg-video-i810, + instead of OR. + * debian/local/dexconf + - Added support for vmmouse_detect (if present) to override mouse + driver with vmware (see lp bug #71167; also requires new mdetect). + * debian/local/Failsafe/*, debian/x11-common.install: + - Added first release of Bulletproof-X for testing. Changes to + displayconfig-gtk and gdm are required before this can be made + default. See debian/local/Failsafe/README for details. + + -- Bryce Harrington <[EMAIL PROTECTED]> Wed, 1 Aug 2007 13:08:11 -0700 + xorg (1:7.2-5) unstable; urgency=low * Don't use the dexconf function fetch to get the modes. This will fail when @@ -345,6 +594,139 @@ xorg (1:7.2-4) unstable; urgency=low -- David Nusinow <[EMAIL PROTECTED]> Mon, 11 Jun 2007 22:58:03 -0400 +xorg (1:7.2-3ubuntu4) gutsy; urgency=low + + * Add debian/apport/xorg-server.py: Bryce's apport hook for xorg-server + crashes. + * debian/x11-common.install: Install debian/apport/* into the apport package + hooks directory. + + -- Martin Pitt <[EMAIL PROTECTED]> Tue, 03 Jul 2007 10:09:31 +0200 + +xorg (1:7.2-3ubuntu3) gutsy; urgency=low + + [Bryce Harrington] + * Move xorg-docs Depends to Suggests, because xorg-docs is in universe. + + -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 4 Jun 2007 20:53:22 +0300 + +xorg (1:7.2-3ubuntu2) gutsy; urgency=low + + * debian/xserver-xorg.postinst.in: + - Fix an elif-sentence which was mistakenly appended to the previous + line, hence broke the upgrade. + * This change got dropped from the changelog, so here it is: + - debian/scripts/var.{i386,amd64}: + Install both xserver-xorg-video-intel AND xserver-xorg-video-i810, + instead of OR. + + -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 4 Jun 2007 17:01:13 +0300 + +xorg (1:7.2-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control, debian/scripts/vars.sparc, debian/rules: + + Makes xorg Architecture: any and use an extra variable + to not Depends on type-handling. + - debian/control: + + Keep meta-packages for xbase-clients, xutils. + + Change the Maintainer-field. + + Add replaces for xinit since we now ship Xsession from x11-common. + Ditto for xrgb as we ship rgb.txt in x11-common. + + xserver-xorg: Add dependancy "OR xserver-xorg-video" because + the restricted drivers provide that. + - debian/local/Xsession: + + If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last + 0.5MiB to avoid having it grow indefinitively. (This does not happen + with gdm anyway since gdm cleans the file on login). (LP: #60448) + - debian/local/dexconf: + + Uncoditionally re-enable ZAxisMapping in dexconf. (LP: #31827) + + Add InputDevice entries for wacom. + + Add extra bits for ps3fb xorg.conf. + + Read xserver-xorg/config/device/extra_options key, parse it + (first token is option name, rest of the line after first space + is value), and add it as Option lines to the device section. + (LP: #90109) + + Add special case for i810 with 3M TouchScreen monitors to set a + resolution of 800x600 and avoid probing since it will fail miserably + in xserver-xorg.postinst. Also make sure to write Option "DisplayInfo" + "False" in Device Section in dexconf if the above combination is + matched otherwise the card will display extra unrequired info each + time X attempts a startup. (touches also xserver-xorg.postinst.in) + + Due to a very annoying DRI/DRM bug, make sure to use OldDmaInit + when writing down the Device section for mga driver. This will make + DRI working at least for AGP cards. PCI didn't work before and it will + keep not working since the option does explicitly disable DRI for PCI. + (LP: #27442) + + Enable elographics driver when matching known machines. + + Disable composite when using the fglrx driver. It does not support + composition, and enabling it by default (as recently done in + xorg-server) breaks DRI for fglrx. (LP: #90688) + - debian/scripts/vars.i386: + + Add xserver-xorg-input-elographics to XSERVER_XORG_INPUT_DEPENDS. + - debian/xserver-xorg.postinst.in: + + Add lt to list of non-Latin keymaps (LP: #38931). + + Make sure to ask video driver on sparc even if autodetected. Some + cards still require weird overrides (ati -> fbdev) that are not + 100% known in all combinations. + + Skip video card autodetection if xforcevesa is set + (LP #27020, #59618). + + Detect keyboard layout configuration using /etc/default/console-setup + if available. + + Clean up duplicate keymaps in xserver-xorg.config.in and make sure + they're all neatly alphabetised. + + Map cf console keymap to ca(fr). + + Map croat console keymap to hr. (LP: #43598) + + Set default keyboard variant for French to oss (LP: #89835). + + Map et console keymap to ee. (LP: #42800) + + Map mk console keymap to mk. + + Map nl console keymap to nl. (LP: #26552) + + Map ru console keymap to ru. + + Map slovene console keymap to si. (LP: #27509) + + Map sr-cy console keymap to map to cs, not sr, following + xkeyboard-config changes. + + Handle trfu/trqu console keymaps the same way as trf/trq. + (LP #37867) + + Map uk console keymap to gb, not gb(intl). (LP: #58016) + + Try autodetecting South Korean keyboards. They have to be detected + from LANG since they use US keymaps on the console. + + Fix sanity-checking logic for French Canadian vs. US-layout + keyboards. (LP: #34627) + + Sparc doesn't need sun types keyboard since 2.6 kernel come to play + in the game. Make it use pc105 instead with xorg rules. + + Use fbset for HPPA. + + Write down sync ranges for sis driver. Too many reports on sis driver + not being able to get a clue on the connected monitor. (LP: #30489) + + Some ati cards require a kick (sync ranges) when using DVI output. + (LP: #39570) + + Make sure to write sync values for Intel Corporation 82852/855GM + Integrated Graphics Device when monitor is LCV/LDVS. + (LP: #13846) + + Write sync values for Intel Mobile 945GM. (LP: #62002) + + Make sure to write sync ranges with CTX S501A LCD monitor since it + seems to return 2 sets of sync ranges but only one is valid and of + course the drivers pick up the wrong one. (LP: #38772) + + On fresh installs, if the display is not a lcd/lvds, there are no + known syncs frequencies for the monitor and the card is mga, do NOT + write SYNC_RANGES. It appears that mga can cope just fine parting + vesa info too. (LP: #19098) + - debian/xserver-xorg.templates: + + Add xserver-xorg/config/device/extra_options so that extra graphics + driver options can be set through debconf and respected by dexconf. + We need this in restricted-manager to make restricted drivers like + nvidia work OOTB for compiz, but it is certainly useful for other + things, too. (NB that the question is never asked interactively). + * debian/control: + - Drop xlibs-dev, since no package Build-depends on it anymore + (other than via alternatives). + * debian/rules: + - Drop change in SERVERABIVER, not used anywhere. + * debian/xserver-xorg.links: + - Drop the symlink "usr/share/X11/fonts -> usr/share/fonts/X11", since + the server default path is correct and always used now. + + -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 4 Jun 2007 11:20:17 +0300 + xorg (1:7.2-3) unstable; urgency=low [ Christian Perrier ] @@ -441,6 +823,217 @@ xorg (1:7.2-2) experimental; urgency=low -- David Nusinow <[EMAIL PROTECTED]> Sun, 15 Apr 2007 11:44:28 -0400 +xorg (1:7.2-0ubuntu11) feisty; urgency=low + + * debian/local/dexconf: + - Change the wacom device path /dev/wacom -> /dev/input/wacom so + USB devices have a chance to work out-of-the-box. Serial devices + use the initscript from wacom driver as before. + + -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 2 Apr 2007 17:17:58 +0300 + +xorg (1:7.2-0ubuntu10) feisty; urgency=low + + * debian/xserver-xorg.postinst.in: + - Move the special case of elographics after xresprobing, so we can + check if PROBE_DUMP is empty, and only then use the special case. + (LP: #89590) + * debian/scripts/vars.* + - add the intel and -modesetting drivers as a substitute for -i810. + Taken from Debian. (LP: #80417) + + -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 30 Mar 2007 18:04:08 +0300 + +xorg (1:7.2-0ubuntu9) feisty; urgency=low + + [ Colin Watson ] + * debian/xserver-xorg.config.in: Improve expr return code handling in + validate_nice_value (the right way this time); don't use run function + when we need to check db_input's return value (LP: #68267). + + [ Timo Aaltonen ] + * debian/xserver-xorg.postinst.in: Intel Mobile 945GM needs sync ranges + (LP: #62002) + + -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 27 Mar 2007 00:44:01 +0300 + +xorg (1:7.2-0ubuntu8) feisty; urgency=low + + * debian/local/dexconf: + - Revert enabling horizontal scrolling for synaptics, since it is broken + for some hardware. Better to be on the safe side. + - Fix the reference to xorg.conf manpage (LP: #52032) + + -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 16 Mar 2007 10:49:18 +0200 + +xorg (1:7.2-0ubuntu7) feisty; urgency=low + + * debian/local/dexconf: Disable composite when using the fglrx driver. It + does not support composition, and enabling it by default (as recently done + in xorg-server) breaks DRI for fglrx. (LP: #90688) + + -- Martin Pitt <[EMAIL PROTECTED]> Fri, 9 Mar 2007 10:52:42 +0100 + +xorg (1:7.2-0ubuntu6) feisty; urgency=low + + * xserver-xorg.templates: Add xserver-xorg/config/device/extra_options so + that extra graphics driver options can be set through debconf and + respected by dexconf. We need this in restricted-manager to make + restricted drivers like nvidia work OOTB for compiz, but it is certainly + useful for other things, too. (NB that the question is never asked + interactively). + * debian/local/dexconf: Read above debconf key, parse it (first token is + option name, rest of the line after first space is value), and add it as + Option lines to the device section. (LP: #90109) + + -- Martin Pitt <[EMAIL PROTECTED]> Thu, 8 Mar 2007 11:40:50 +0100 + +xorg (1:7.2-0ubuntu5) feisty; urgency=low + + * revert the "fix" to validate_nice_value, which in fact broke it + completely. + + -- Timo Aaltonen <[EMAIL PROTECTED]> Wed, 7 Mar 2007 12:19:27 +0200 + +xorg (1:7.2-0ubuntu4) feisty; urgency=low + + * debian/x11-common.config.in: + - fix validate_nice_value() not to fail when using adept + (Closes: LP #68267) + * debian/local/dexconf: + - don't set HorizScrollDelta for synaptics so that horizontal scrolling + works. (Closes: LP #40021) + + -- Timo Aaltonen <[EMAIL PROTECTED]> Wed, 7 Mar 2007 07:59:58 +0200 + +xorg (1:7.2-0ubuntu3) feisty; urgency=low + + * Set default keyboard variant for French to oss (LP: #89835). + + -- Colin Watson <[EMAIL PROTECTED]> Tue, 6 Mar 2007 11:20:23 +0000 + +xorg (1:7.2-0ubuntu2) feisty; urgency=low + + * Add xserver-xorg-video-1.0 alternative to the Depends for + xserver-xorg. + + -- Kyle McMartin <[EMAIL PROTECTED]> Sun, 4 Mar 2007 15:48:54 +0000 + +xorg (1:7.2-0ubuntu1) feisty; urgency=low + + * debian/control: + - don't require a xserver-xorg-core non available yet, the versionned + Depends is only for reportbug + * debian/control, debian/scripts/vars.sparc, debian/rules: + - makes xorg arch any and use an extra variable + to not Depends on type-handling + + [ Timo Aaltonen ] + * Merge with Debian, remaining changes: + - debian/control: + + Add replaces for xinit since we now ship Xsession from x11-common. + Ditto for xrgb as we ship rgb.txt in x11-common. + + xserver-xorg: + Depends: xserver-xorg-video-1.0 -> xserver-xorg-video. + Put ${F:XServer-Xorg-Detect-Depends} in Recommends:, like the rest + of the tools. + + Added Replaces: xserver-xorg-driver-all to xserver-xorg-video-all + + Added Conflicts: xserver-xorg-driver-all to xserver-xorg-video-all + + Keep meta-packages for xlibs-dev, xbase-clients, xutils + - debian/local/Xsession: + + Set temporary umask when creating $ERRFILE + + If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last + 0.5MiB to avoid having it grow indefinitively. (This does not happen + with gdm anyway since gdm cleans the file on login). + (Closes: LP #60448) + - debian/local/dexconf: + + don't put /usr/X11R6/* in font paths. + + Uncoditionally re-enable ZAxisMapping in dexconf. + (Closes: LP #31827) + + Add InputDevice entries for wacom. + + Add extra bits for ps3fb xorg.conf + + Add special case for i810 with 3M TouchScreen monitors to set a + resolution of 800x600 and avoid probing since it will fail miserably + in xserver-xorg.postinst. Also make sure to write Option "DisplayInfo" + "False" in Device Section in dexconf if the above combination is + matched otherwise the card will display extra unrequired info each + time X attempts a startup. (touches also xserver-xorg.postinst.in) + + Due to a very annoying DRI/DRM bug, make sure to use OldDmaInit + when writing down the Device section for mga driver. This will make + DRI working at least for AGP cards. PCI didn't work before and it will + keep not working since the option does explicitly disable DRI for PCI. + (Closes: LP #27442) + + Enable elographics driver when matching known machines. + - debian/rules: + + set XSERVER_XORG_DETECT_DEPENDS, but with an empty list since the old + packages are already in Recommends:. + + move the dh_gencontrol trick to binary-indep:, so it actually is set + for xserver-xorg. + - debian/scripts/vars* + + Add xserver-xorg-input-elographics to XSERVER_XORG_INPUT_DEPENDS. + + Set XSERVER_XORG_DETECT_DEPENDS on amd64, hppa, i386, ia64. + + Add xserver-xorg-video-vmware on amd64, remove from non-x86* archs. + - debian/x11-common.{dirs,links}: don't ship usr/X11R6/lib/X11/fonts + - debian/x11-common.init: Only source /etc/default/rcS if it exists, + allowing x11-common to be installed by debootstrap. + - debian/xserver-xorg.postinst.in: + + Skip video card autodetection if xforcevesa is set + (Closes: LP #27020, #59618). + + Detect keyboard layout configuration using /etc/default/console-setup + if available. + + Translate debian-installer/keymap=uk to gb, not gb(intl) + (Closes: LP #58016) + + Make sure to ask video driver on sparc even if autodetected. Some + cards still require weird overrides (ati -> fbdev) that are not + 100% known in all combinantions. + + Clean up duplicate keymaps in xserver-xorg.config.in and make sure + they're all neatly alphabetised. + + Map cf console keymap to ca(fr), and fix sanity-checking logic for + French Canadian vs. US-layout keyboards. (Closes: LP #34627) + + Map et console keymap to ee. (Closes: LP #42800) + + Map nl console keymap to nl. (Closes: LP #26552) + + Map gr console keymap to gr, and add it to the list of non-Latin + keymaps. + + Map mk, ro, and ru console keymaps to mk, ro, and ru respectively. + + Change sr-cy console keymap to map to cs, not sr, following + xkeyboard-config changes. Add this to the list of non-Latin keymaps. + + Handle trfu/trqu console keymaps the same way as trf/trq. + (Closes: LP #37867) + + Map croat console keymap to hr. (Closes: LP #43598) + + Try autodetecting South Korean keyboards. They have to be detected + from LANG since they use US keymaps on the console. + + Sparc doesn't need sun types keyboard since 2.6 kernel come to play + in the game. Make it use pc105 instead with xorg rules. + + Use fbset for HPPA. + + Write down sync ranges for sis driver. Too many reports on sis driver + not being able to get a clue on the connected monitor. + (Closes at least: LP #30489) + + Some ati cards require a kick (sync ranges) when using DVI output. + (Closes: LP #39570) + + Make sure to write sync values for Intel Corporation 82852/855GM + Integrated Graphics Device when monitor is LCV/LDVS. + (Closes: LP #13846) + + Make sure to write sync ranges with CTX S501A LCD monitor since it + seems to return 2 sets of sync ranges but only one is valid and of + course the drivers pick up the wrong one. (Closes: LP #38772) + + On fresh installs, if the display is not a lcd/lvds, there are no + known syncs frequencies for the monitor and the card is mga, do NOT + write SYNC_RANGES. It appears that mga can cope just fine parting + vesa info too. (Closes: LP #19098) + * debian/local/dexconf: + - change font paths /usr/share/X11/fonts -> /usr/share/fonts/X11. + * debian/rules: + - change SERVERABIBUMP to 7.2 + * debian/xserver-xorg.links: + - ship a symlink "usr/share/X11/fonts -> usr/share/fonts/X11". + * debian/control: + - change the Maintainer-fields. + + [ Colin Watson ] + * Add lt to list of non-Latin keymaps (LP: #38931). + + -- Sebastien Bacher <[EMAIL PROTECTED]> Fri, 23 Feb 2007 14:05:18 +0100 + xorg (1:7.1.0-18) unstable; urgency=high * Add more conflicts to x11-common: @@ -899,6 +1492,139 @@ xorg (1:7.0.23) unstable; urgency=low -- Denis Barbier <[EMAIL PROTECTED]> Sat, 12 Aug 2006 18:11:07 +0200 +xorg (1:7.1.1ubuntu8) feisty; urgency=low + + * dexconf: Add extra bits for ps3fb xorg.conf + + -- Ben Collins <[EMAIL PROTECTED]> Fri, 16 Feb 2007 16:38:16 -0500 + +xorg (1:7.1.1ubuntu7) feisty; urgency=low + + [ robepisc ] + * Skip video card autodetection if xforcevesa is set (LP: #59618). + + -- Colin Watson <[EMAIL PROTECTED]> Wed, 31 Jan 2007 10:38:30 +0000 + +xorg (1:7.1.1ubuntu6) edgy; urgency=low + + * debian/control: fix Replaces typo for xinit's version. + + -- Kees Cook <[EMAIL PROTECTED]> Fri, 20 Oct 2006 09:00:43 -0700 + +xorg (1:7.1.1ubuntu5) edgy; urgency=low + + * debian/local/dexconf: close fd 4 before rm. Patch from Roshan Shariff + (Closes Malone #65763). + + -- Kees Cook <[EMAIL PROTECTED]> Tue, 17 Oct 2006 12:09:06 -0700 + +xorg (1:7.1.1ubuntu4) edgy; urgency=low + + * Restore xbase-clients, xlibs-dev, and xutils transitional packages for + now, since many packages in Edgy still depend or build-depend on them. + + -- Colin Watson <[EMAIL PROTECTED]> Mon, 16 Oct 2006 21:01:43 +0100 + +xorg (1:7.1.1ubuntu3) edgy; urgency=low + + * SECURITY UPDATE: Fix race condition when chown'ing .xsession-errors. + * debian/local/Xsession: set temporary umask when creating $ERRFILE. + * References: + CVE-2006-5214 + + -- Kees Cook <[EMAIL PROTECTED]> Thu, 12 Oct 2006 08:34:57 -0700 + +xorg (1:7.1.1ubuntu2) edgy; urgency=low + + * debian/local/Xsession: If ~/.xsession-errors is bigger than 0.5MiB, + truncate it to the last 0.5MiB to avoid having it grow indefinitively. + (This does not happen with gdm anyway since gdm cleans the file on login). + Closes: LP#60448 + + -- Martin Pitt <[EMAIL PROTECTED]> Thu, 5 Oct 2006 14:00:47 +0200 + +xorg (1:7.1.1ubuntu1) edgy; urgency=low + + * Make discover call non-fatal on sparc to fix dist-upgrades. + + * Increase version number to match current X version. + (Closes Ubuntu: #58700) + + * Fix debian/rules clean target. + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Tue, 03 Oct 2006 06:56:47 +0200 + +xorg (1:7.0.22ubuntu10) edgy; urgency=low + + * debian/xserver-xorg.config.in: Translate debian-installer/keymap=uk to + gb, not gb(intl) (closes: Malone #58016). + + -- Colin Watson <[EMAIL PROTECTED]> Mon, 18 Sep 2006 14:17:04 +0100 + +xorg (1:7.0.22ubuntu9) edgy; urgency=low + + * debian/x11-common.init: Only source /etc/default/rcS if it exists, + allowing x11-common to be installed by debootstrap. + + -- Colin Watson <[EMAIL PROTECTED]> Sun, 10 Sep 2006 15:23:02 +0100 + +xorg (1:7.0.22ubuntu8) edgy; urgency=low + + * Detect keyboard layout configuration using /etc/default/console-setup if + available. + + -- Colin Watson <[EMAIL PROTECTED]> Thu, 7 Sep 2006 09:36:45 +0100 + +xorg (1:7.0.22ubuntu7) edgy; urgency=low + + * Added Replaces: xserver-xorg-driver-all to xserver-xorg-video-all + * Added Conflicts: xserver-xorg-driver-all to xserver-xorg-video-all + + -- Rodrigo Parra Novo <[EMAIL PROTECTED]> Thu, 27 Jul 2006 20:34:26 -0300 + +xorg (1:7.0.22ubuntu6) edgy; urgency=low + + * remove bashism in xserver-xorg.postinst.in + + -- Oliver Grawert <[EMAIL PROTECTED]> Mon, 17 Jul 2006 21:13:25 +0200 + +xorg (1:7.0.22ubuntu5) edgy; urgency=low + + * Remove broken upgrade detection from debian/xserver-xorg.postinst.in; + debian/xsfbs/xsfbs.sh does a better job. See Debian #375689. + + -- Colin Watson <[EMAIL PROTECTED]> Mon, 17 Jul 2006 11:28:27 +0100 + +xorg (1:7.0.22ubuntu4) edgy; urgency=low + + * Added xserver-xorg-input-elographics to debian/scripts/i386.vars, to let + xserver-xorg-input-all on i386) to Require it correctly + + -- Rodrigo Parra Novo <[EMAIL PROTECTED]> Thu, 13 Jul 2006 18:08:26 -0300 + +xorg (1:7.0.22ubuntu3) edgy; urgency=low + + * sparc doesn't have newport and tga video drivers. + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Wed, 12 Jul 2006 12:56:20 +0200 + +xorg (1:7.0.22ubuntu2) edgy; urgency=low + + * Renamed package xserver-xorg-driver-all to xserver-xorg-video-all + * Moved requirements of above package from *-driver-* to *-video-* + + -- Rodrigo Parra Novo <[EMAIL PROTECTED]> Tue, 11 Jul 2006 14:03:28 -0300 + +xorg (1:7.0.22ubuntu1) edgy; urgency=low + + * Merge with Debian + * Add replaces for xinit since we now ship Xsession from x11-common. + * Ditto for xrgb as we ship rgb.txt in x11-common. + * Make conflict with xbase-clients and xutils looser for now. They will + be tightened again once we have synced those from Debian. + + -- Tollef Fog Heen <[EMAIL PROTECTED]> Wed, 5 Jul 2006 15:42:58 +0200 + xorg (1:7.0.22) unstable; urgency=low [ David Nusinow ] @@ -1361,6 +2087,326 @@ xorg (1:7.0.0) experimental; urgency=low -- David Nusinow <[EMAIL PROTECTED]> Mon, 20 Feb 2006 22:10:54 -0500 +xorg (7.0.0-0ubuntu45) dapper; urgency=low + + * Apply patch from LaMont to skip Xorg configuration in the absense + of /dev/fb0, so the server can be installed on headless machines + like, oh, say, the livefs buildd (closes: launchpad.net/46496) + + -- Adam Conrad <[EMAIL PROTECTED]> Mon, 29 May 2006 03:56:19 +1000 + +xorg (7.0.0-0ubuntu44) dapper; urgency=low + + * Map cf console keymap to ca(fr), and fix sanity-checking logic for + French Canadian vs. US-layout keyboards. + (Closes Ubuntu: #34627) + + -- Colin Watson <[EMAIL PROTECTED]> Wed, 17 May 2006 13:06:11 +0100 + +xorg (7.0.0-0ubuntu43) dapper; urgency=low + + * Kill possible loop when asking nice values. + (Closes Ubuntu: #41976) + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Tue, 09 May 2006 09:02:41 +0200 + +xorg (7.0.0-0ubuntu42) dapper; urgency=low + + * Map et console keymap to ee. + (Closes Ubuntu: #42800) + + * Handle fi-latin1 console keymap the same way as fi. + (Closes Ubuntu: #42650) + + * Map nl console keymap to nl. + (Closes Ubuntu: #26552) + + * Map gr console keymap to gr, and add it to the list of non-Latin + keymaps. + + * Map mk, ro, and ru console keymaps to mk, ro, and ru respectively. + + * Change sr-cy console keymap to map to cs, not sr, following + xkeyboard-config changes. Add this to the list of non-Latin keymaps. + + -- Colin Watson <[EMAIL PROTECTED]> Mon, 8 May 2006 16:56:19 +0100 + +xorg (7.0.0-0ubuntu41) dapper; urgency=low + + * Handle trfu/trqu console keymaps the same way as trf/trq. + (Closes Ubuntu: #37867) + + * Map croat console keymap to hr. + (Closes Ubuntu: #43598) + + -- Colin Watson <[EMAIL PROTECTED]> Mon, 8 May 2006 14:24:48 +0100 + +xorg (7.0.0-0ubuntu40) dapper; urgency=low + + * Write down sync ranges for sis driver. Too many reports on sis driver not + being able to get a clue on the connected monitor. + (Closes at least Ubuntu: #30489) + + * Change xutils/xbase-clients descriptions since they can't be really + removed as claimed. Tho packages should really stop depending on them. + (Closes Ubuntu: 42910) + + * Fix regex match for HPPADEPTH. + (thanks to LaMont Jones for the patch) + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Fri, 05 May 2006 09:03:34 +0200 + +xorg (7.0.0-0ubuntu39) dapper; urgency=low + + * Make sure to set UseFBDev on MacMini and old Macs that use r128 driver. + (Thanks to Benh for the report and the fix and being such a cool guy) + + * Make sure to write sync ranges with CTX S501A LCD monitor since it seems + to return 2 sets of sync ranges but only one is valid and of course the + drivers pick up the wrong one. + (Closes Ubuntu: #38772) + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Thu, 04 May 2006 10:11:43 +0200 + +xorg (7.0.0-0ubuntu38) dapper; urgency=low + + * Some ati cards require a kick (sync ranges) when using DVI output. + (Closes Ubuntu: #39570) + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Wed, 03 May 2006 11:10:28 +0200 + +xorg (7.0.0-0ubuntu37) dapper; urgency=low + + * Make sure to write sync values for Intel Corporation 82852/855GM + Integrated Graphics Device when monitor is LCV/LDVS. + (Closes Ubuntu: #13846) + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Wed, 03 May 2006 09:35:49 +0200 + +xorg (7.0.0-0ubuntu36) dapper; urgency=low + + * Depends on xserver-xorg-input-elographics required to drive touchscreens + on IBM Point Of Sales. + + * Enable elographics driver in dexconf when matching known machines. + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Tue, 02 May 2006 09:52:34 +0200 + +xorg (7.0.0-0ubuntu35) dapper; urgency=low + + * Sync xorg-dev package from Debian and make it Arch: all. + (Closes Ubuntu: #39613) + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Mon, 01 May 2006 08:44:03 +0200 + +xorg (7.0.0-0ubuntu34) dapper; urgency=low + + * On some upgrades the X symlink checksum has been lost for unknown + reasons. Make sure to recreate it if that's the case. + + * Partially revert the patch introduced in 7.0.0-0ubuntu33 that forces sync + rages for all ati. + Peter Schewenke (author of the original patch) did provide a better one + after investigating one possible regression. + (Closes Ubuntu: #29970) + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Fri, 28 Apr 2006 08:35:38 +0200 + +xorg (7.0.0-0ubuntu33) dapper; urgency=low + + * Make sure to always write sync rages with ati driver and lcd/lvds + monitors. According to #39762 this is always required. + Also cleanup the ati code that was forcing MONITOR_SYNC_RANGE later + in the process since it is now catched by the more generic one. + (Closes Ubuntu: #39762, #37025) + + * Simply the ati powerpc MONITOR_SYNC_RANGE code. + + * Remove unused var from xserver-xorg.postinst.in. + + * Invoke dmidecode when ARCH != ia64 at least untill dmidecode is fixed + since ia64 does not really need it yet. + (Closes Ubuntu: #40659) + + * Make hppa users happy with a catch all config: + - Add Depends: fbset for hppa. + - update debian/scripts/vars.hppa. + - update debian/xserver-xorg.postinst.in. + (thanks to LaMont Jones for the patch) + + NOTE: this code should probably move to xresprobe to return proper info + directly, but it might be too intrusive to do it at this point + of the release. + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Thu, 27 Apr 2006 08:18:16 +0200 + +xorg (7.0.0-0ubuntu32) dapper; urgency=low + + * Fix typo in xserver-xorg.in. + + -- Tollef Fog Heen <[EMAIL PROTECTED]> Wed, 26 Apr 2006 18:03:20 +0200 + +xorg (7.0.0-0ubuntu31) dapper; urgency=low + + * Add Slovenian, Swiss French and Swiss German keyboard layout + detection. Malone: #27509 + + -- Tollef Fog Heen <[EMAIL PROTECTED]> Wed, 26 Apr 2006 11:49:18 +0200 + +xorg (7.0.0-0ubuntu30) dapper; urgency=low + + * Remove init script messages from x11-common; it basically amounts to a + mkdir and the user doesn't need to be specially informed + + -- Matt Zimmerman <[EMAIL PROTECTED]> Mon, 24 Apr 2006 10:53:55 -0700 + +xorg (7.0.0-0ubuntu29) dapper; urgency=low + + * On fresh installs, if the display is not a lcd/lvds, there are not know + syncs frequencies for the monitor and the card is mga, do NOT write + SYNC_RANGES. It appears that mga can cope just fine parting vesa info too. + (Closes Ubuntu: #19098) + + * Due to a very annoying DRI/DRM bug, make sure to use OldDmaInit when + writing down the Device section for mga driver. This will make DRI working + at least for AGP cards. PCI didn't work before and it will keep not + working since the option does explicitly disable DRI for PCI. + (Closes Ubuntu: #27442) + + -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Tue, 18 Apr 2006 09:07:57 +0200 + +xorg (7.0.0-0ubuntu28) dapper; urgency=low + + * Autogenerate Wacom support + + -- Matthew Garrett <[EMAIL PROTECTED]> Sun, 9 Apr 2006 17:10:27 +0100 + +xorg (7.0.0-0ubuntu27) dapper; urgency=low + + * Make discover_video attempt first pci and in case of failure sbus + on sparc and sparc only. + + * Make sure to ask video driver on sparc even if autodetected. Some + cards still require weird overrides (ati -> fbdev) that are not + 100% known in all combinantions. + + * Sparc doesn't need sun types keyboard since 2.6 kernel come to play + in the game. Make it use pc105 instead with xorg rules. + + * Add special case for i810 with 3M TouchScreen monitors to set a resolution + of 800x600 and avoid probing since it will fail miserably in + xserver-xorg.postinst. Also make sure to write Option "DisplayInfo" "False" + in Device Section in dexconf if the above combination is matched otherwise + the card will display extra unrequired info each time X attempts a + startup. + + * Readd Depends: xserver-xorg-input-wacom to xserver-xorg-input-all. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]