diff -pruN 1:7.7+19/debian/changelog 1:7.7+19ubuntu15/debian/changelog --- 1:7.7+19/debian/changelog 2017-05-03 09:38:16.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/changelog 2020-10-09 08:17:12.000000000 +0000 @@ -1,3 +1,124 @@ +xorg (1:7.7+19ubuntu15) groovy; urgency=medium + + * debian/local/Xsession.d/60x11-common_localhost: Dropped, it's + provided by 35x11-common_xhost-local now. (LP: #1576454) + + -- Timo Aaltonen Fri, 09 Oct 2020 11:17:12 +0300 + +xorg (1:7.7+19ubuntu14) focal; urgency=medium + + * No-change rebuild with fixed binutils on arm64. + + -- Matthias Klose Sat, 08 Feb 2020 11:21:28 +0000 + +xorg (1:7.7+19ubuntu13) focal; urgency=medium + + * Omit xorg, xserver-xorg, xserver-xorg-{input,video}-all binaries on + i386. + + -- Steve Langasek Thu, 09 Jan 2020 17:38:55 -0800 + +xorg (1:7.7+19ubuntu12) disco; urgency=medium + + * control: Restore -intel to x-x-video-all Recommends, glamor needs + OpenGL 2.1 which i915_dri.so doesn't support. (LP: #1819943) + * control: Add mesa-vulkan-drivers back to xserver-xorg recommends. + + -- Timo Aaltonen Tue, 26 Mar 2019 17:46:22 +0200 + +xorg (1:7.7+19ubuntu11) disco; urgency=medium + + * Drop mesa-vulkan-drivers from xserver-xorg Recommends, until vulkan- + loader is in main. + + -- Timo Aaltonen Sat, 16 Mar 2019 00:16:43 +0200 + +xorg (1:7.7+19ubuntu10) disco; urgency=medium + + * control: Add mesa-vulkan-drivers to xserver-xorg Recommends. (LP: + #1742714) + + -- Timo Aaltonen Wed, 13 Mar 2019 13:54:57 +0200 + +xorg (1:7.7+19ubuntu9) disco; urgency=medium + + * control: Move xserver-xorg-video-intel to Suggests of -video-all. + + -- Timo Aaltonen Fri, 01 Feb 2019 23:55:16 +0200 + +xorg (1:7.7+19ubuntu8) cosmic; urgency=medium + + * x11-common.preinst: + - Rename nux config leftovers which might change the environment + even when not running an unity session (LP: #1768610) + * debian/control: + - x11-common breaks nux-tools (<< 4.0.8+18.04.20180613.5-0ubuntu1) - this + version contains the fixed conffile; if it's installed on the system we + need people to be upgraded to the new version. + + -- Marco Trevisan (Treviño) Thu, 21 Jun 2018 11:37:03 +0100 + +xorg (1:7.7+19ubuntu7) bionic; urgency=medium + + [ Simon Quigley ] + * 60x11-common_xdg_path: If $XDG_CONFIG_DIRS is nonempty, don't discard the + contents. + + [ Didier Roche ] + * 60x11-common_xdg_path: + - protect against multiple additions of the same paths to + XDG_CONFIG_DIRS and XDG_DATA_DIRS, resulting to duplication on + consecutive logout/logins due to older session hanging in and env + being reused. + Some consequences is that electron application crashes (LP: #1764355) + - remove readdition of defaults if XDG_CONFIG_DIRS isn't empty to respect + user's selection (same logic than wayland session). + + -- Timo Aaltonen Thu, 19 Apr 2018 17:47:42 +0300 + +xorg (1:7.7+19ubuntu6) bionic; urgency=medium + + * control: Add python3-apport to xserver-xorg depends due to the apport hook. + (LP: #1730035) + * control: Depend on x11proto-dev instead of the old packages. + + -- Timo Aaltonen Thu, 05 Apr 2018 15:47:54 +0300 + +xorg (1:7.7+19ubuntu5) bionic; urgency=medium + + * Cleanup upstart Xsession.d files, when upstart is removed, but not + purged, and thus breaking graphical login after upgrades. LP: #1749199 + + -- Dimitri John Ledkov Thu, 22 Feb 2018 16:43:18 +0000 + +xorg (1:7.7+19ubuntu4) bionic; urgency=medium + + * Recommend gnome-terminal before xterm to try to help germinate + pick the correct alternate dependency (LP: #1720482) + + -- Jeremy Bicha Tue, 30 Jan 2018 20:43:33 -0500 + +xorg (1:7.7+19ubuntu3) artful; urgency=medium + + * Add alternate dependency on gnome-terminal (LP: #1720482) + + -- Jeremy Bicha Thu, 12 Oct 2017 10:25:30 -0400 + +xorg (1:7.7+19ubuntu2) artful; urgency=medium + + * control, source_xorg.py, xserver-xorg.install, rules: Import apport package + hook and links from xdiagnose 3.8.7. + * source_xorg.py: Drop obsolete stuff from the hook, attach Xorg.0.log + from home directory. + + -- Timo Aaltonen Thu, 31 Aug 2017 13:43:41 +0300 + +xorg (1:7.7+19ubuntu1) artful; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen Wed, 03 May 2017 19:06:02 +0300 + xorg (1:7.7+19) unstable; urgency=high * Team upload. @@ -7,6 +128,13 @@ xorg (1:7.7+19) unstable; urgency=high -- Julien Cristau Wed, 03 May 2017 11:38:16 +0200 +xorg (1:7.7+18ubuntu1) artful; urgency=medium + + * Merge from Debian. + - drop -synaptics from -input-all Recommends (LP: #1685542) + + -- Timo Aaltonen Mon, 24 Apr 2017 16:38:55 +0300 + xorg (1:7.7+18) unstable; urgency=medium * Call db_purge without arguments in postinst to fix error uncovered by @@ -28,6 +156,49 @@ xorg (1:7.7+17) unstable; urgency=medium -- Emilio Pozuelo Monfort Wed, 23 Nov 2016 00:02:26 +0100 +xorg (1:7.7+16ubuntu3) zesty; urgency=medium + + * control: Drop alt recommends on xorg-driver-video, because it makes + no sense for Recommends. + * control: Drop xserver-xorg-video-freedreno from video-all (arm). + (LP: #1679323) + + -- Timo Aaltonen Tue, 04 Apr 2017 00:47:23 +0300 + +xorg (1:7.7+16ubuntu2) zesty; urgency=medium + + * control: Add -synaptics to input-all Recommends for linux, and move + wacom there. + + -- Timo Aaltonen Thu, 20 Oct 2016 20:28:30 +0300 + +xorg (1:7.7+16ubuntu1) zesty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - control: add xserver-xorg-video-geode for i386 Suggests + - control: demote 'xserver-xorg-video-all | xorg-driver-video' to + Recommends. + - control: promote xserver-xorg-input-wacom to Depends + - control: drop depend on libgl*-mesa* on armhf + - control: add xinput to xorg Depends + - control: demote xfonts-{100dpi,75dpi,scalable} * to xorg + Recommends/Suggests + - local/Xsession: truncate ERRFILE if it's too big + - local/Xsession.d/20x11-common_process-args: Add support for + session command containing args (LP: 512235) + - local/Xsession.d/60x11-common_xdg_path: added to set + xdg path depending on the selected session (compatible with + lightdm, gdm and kdm now) (LP: 804734) + * Dropped changes: + - control: Drop freedreno and void from video/input-all. + * Dropped changes, included in Debian: + - control: Drop vmmouse from -input-all depends, our kernel has had + the virtual driver for some time. + - control: Demote -intel to -video-all Recommends, allowing uninstall + without removing the metapackage. + + -- Steve Langasek Tue, 18 Oct 2016 22:04:21 -0700 + xorg (1:7.7+16) unstable; urgency=medium [ Timo Aaltonen ] @@ -63,6 +234,34 @@ xorg (1:7.7+14) unstable; urgency=medium -- Timo Aaltonen Tue, 08 Mar 2016 15:07:40 +0200 +xorg (1:7.7+13ubuntu4) yakkety; urgency=medium + + [ Timo Aaltonen ] + * control: Drop vmmouse from -input-all depends, our kernel has had + the virtual driver for some time. + + -- Steve Langasek Tue, 27 Sep 2016 10:08:59 -0700 + +xorg (1:7.7+13ubuntu3) xenial; urgency=medium + + * control: Drop freedreno and void from video/input-all so that they + don't block the transition while MIR's are being processed. + + -- Timo Aaltonen Fri, 04 Mar 2016 16:53:04 +0200 + +xorg (1:7.7+13ubuntu2) xenial; urgency=medium + + * control: Demote -intel to -video-all Recommends, allowing uninstall + without removing the metapackage. + + -- Timo Aaltonen Thu, 18 Feb 2016 07:35:17 +0200 + +xorg (1:7.7+13ubuntu1) xenial; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen Fri, 05 Feb 2016 17:56:38 +0200 + xorg (1:7.7+13) unstable; urgency=medium [ Andreas Boll ] @@ -78,6 +277,31 @@ xorg (1:7.7+13) unstable; urgency=medium -- Timo Aaltonen Tue, 26 Jan 2016 18:24:15 +0200 +xorg (1:7.7+12ubuntu1) xenial; urgency=medium + + * Merge from Debian, remaining changes: + - control: add xserver-xorg-video-geode for i386 Suggests + - control: demote 'xserver-xorg-video-all | xorg-driver-video' to + Recommends. + - control: promote xserver-xorg-input-wacom to Depends + - control: drop depend on libgl*-mesa* on armhf + - control: add xinput to xorg Depends + - control: demote xfonts-{100dpi,75dpi,scalable} * to xorg + Recommends/Suggests + - local/Xsession: truncate ERRFILE if it's too big + - local/Xsession.d/20x11-common_process-args: Add support for + session command containing args (LP: 512235) + - local/Xsession.d/60x11-common_xdg_path: added to set + xdg path depending on the selected session (compatible with + lightdm, gdm and kdm now) (LP: 804734) + * Drop obsolete diff: + - depends on x11-common because of doc dir symlinking, which is now + handled by pkgbinarymangler + - x11-common.{postinst,preinst,prerm}.in: removing old failsafe-x + files is obsolete since a few years + + -- Timo Aaltonen Tue, 10 Nov 2015 18:17:25 +0200 + xorg (1:7.7+12) unstable; urgency=medium * Team upload. @@ -127,6 +351,21 @@ xorg (1:7.7+9) unstable; urgency=medium -- Julien Cristau Mon, 11 May 2015 14:53:51 +0200 +xorg (1:7.7+7ubuntu4) vivid; urgency=medium + + * xorg-server 1.17 no longer requires a driver because + modesetting is moved to xserver-xorg-core, change + xserver-xorg-video-all | xorg-driver-video to recommends. + + -- Maarten Lankhorst Mon, 16 Mar 2015 18:45:44 +0100 + +xorg (1:7.7+7ubuntu3) vivid; urgency=medium + + * Modesetting has been removed, remove from vars. + * Do not require vesa on armhf, only fbdev is useful. + + -- Maarten Lankhorst Mon, 09 Mar 2015 11:51:24 +0100 + xorg (1:7.7+8) unstable; urgency=medium [ Laurent Bigonville ] @@ -143,6 +382,20 @@ xorg (1:7.7+8) unstable; urgency=medium -- Julien Cristau Sat, 02 May 2015 19:12:00 +0200 +xorg (1:7.7+7ubuntu2) utopic; urgency=medium + + * Lower geode to suggests. (LP: #1368158) + * Explicitly add inkscape to build-depends. + + -- Maarten Lankhorst Mon, 15 Sep 2014 09:36:48 +0200 + +xorg (1:7.7+7ubuntu1) utopic; urgency=medium + + [ Timo Aaltonen ] + * Merge from debian. + + -- Maarten Lankhorst Wed, 10 Sep 2014 20:04:07 +0200 + xorg (1:7.7+7) unstable; urgency=medium * Add minimal ppc64el support (closes: #742731). Thanks, Breno Leitao! @@ -224,6 +477,96 @@ xorg (1:7.7+2) unstable; urgency=low -- Julien Cristau Sat, 23 Feb 2013 12:39:32 +0100 +xorg (1:7.7+1ubuntu8) trusty; urgency=low + + [ Bryce Harrington ] + * scripts/vars.arm*: Don't include -ati or -nouveau, to save + installation space. The drivers build for some arm targets, but no + known devices actually work with them. + + [ Christopher James Halse Rogers ] + * Drop libgl1-mesa-glx, -dri, and libglu from armhf; these are highly likely + to be useless on an armhf system. + + -- Maarten Lankhorst Wed, 29 Jan 2014 16:07:39 +0100 + +xorg (1:7.7+1ubuntu7) trusty; urgency=medium + + * Just depend on xserver-xorg-video-dummy on ppc64el. + + -- Matthias Klose Wed, 18 Dec 2013 12:11:13 +0100 + +xorg (1:7.7+1ubuntu6) saucy; urgency=low + + * Just depend on xserver-xorg-video-dummy on AArch64. + + -- Matthias Klose Thu, 10 Oct 2013 15:56:36 +0200 + +xorg (1:7.7+1ubuntu5) raring; urgency=low + + * Allow xserver-xorg-core-omap-revert and xserver-xorg-video-omap-revert to + satisfy depends on armhf. + - Allows building a custom armhf server there. + + -- Maarten Lankhorst Tue, 07 May 2013 16:29:10 +0200 + +xorg (1:7.7+1ubuntu4) quantal; urgency=low + + [ Maarten Lankhorst ] + * scripts/vars.i386: Remove xserver-xorg-video-geode from -video-all. + + -- Timo Aaltonen Tue, 02 Oct 2012 16:56:32 +0300 + +xorg (1:7.7+1ubuntu3) quantal; urgency=low + + * remove xserver-xorg-video-cirrus from armel and hf + * add xserver-xorg-video-modesetting to armel and armhf + * add xserver-xorg-video-omap to armel and armhf + * Update debian/copyright to refer to new address: + - Fixes lintian old-fsf-address-in-copyright-file + + -- Maarten Lankhorst Thu, 23 Aug 2012 19:23:35 +0200 + +xorg (1:7.7+1ubuntu2) quantal; urgency=low + + * scripts/vars.{amd64,i386}: Add xserver-xorg-video-modesetting to + XSERVER_XORG_VIDEO_DEPENDS. (LP: #1039648) + + -- Timo Aaltonen Tue, 21 Aug 2012 21:08:18 +0300 + +xorg (1:7.7+1ubuntu1) quantal; urgency=low + + [ Maarten Lankhorst ] + * Merge from Debian unstable, remaining changes: + - Add apport hook + - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to + Recommends. + - debian/local/Xsession: + Truncate xsession-errors on startup if too big + - debian/local/Xsession.d/20x11-common_process-args: + Add support for session command containing args. + - debian/local/Xsession.d/60x11-common_localhost: + Authorise all processes running with the user's credentials to connect + to the server. + - debian/local/Xsession.d/60x11-common_xdg_path: + Add session script to set xdg path depending on the selected session. + - debian/rules, debian/control: + Add dependencies on x11-common, since pkgbinarymangler moves the docs + there to save some space on the image. + - debian/scripts/vars.*: + + Don't drop wacom from input-all. + + Add -vmmouse to input-all for amd64 and i386. + + Add -qxl to video-all for amd64 and i386. + + Add -geode to video-all for i386. + + Drop video drivers that are likely irrelevant for ARM. + + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo + from xserver-xorg-video-all dependencies. They are unmaintained and + obsolete. + - debian/x11-common.{preinst,postinst,postrm}.in: + Clean up the old failsafe-x files. + + -- Timo Aaltonen Tue, 03 Jul 2012 16:06:54 +0300 + xorg (1:7.7+1) unstable; urgency=low * Merge xsf-docs up to 6b4a944090 commit: @@ -259,6 +602,12 @@ xorg (1:7.6+13) unstable; urgency=high -- Cyril Brulebois Fri, 11 May 2012 12:24:22 +0200 +xorg (1:7.6+12ubuntu1) precise; urgency=low + + * Merge from Debian unstable. + + -- Timo Aaltonen Thu, 22 Mar 2012 19:42:07 +0200 + xorg (1:7.6+12) unstable; urgency=high * Fix unsafe manipulation of /tmp/.X11-unix and /tmp/.ICE-unix in the @@ -281,6 +630,38 @@ xorg (1:7.6+11) unstable; urgency=low -- Josselin Mouette Sat, 28 Jan 2012 12:42:38 +0100 +xorg (1:7.6+10ubuntu1) precise; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add apport hook + - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to + Recommends. + - debian/local/Xsession: + Truncate xsession-errors on startup if too big + - debian/local/Xsession.d/20x11-common_process-args: + Add support for session command containing args. + - debian/local/Xsession.d/60x11-common_localhost: + Authorise all processes running with the user's credentials to connect + to the server. + - debian/local/Xsession.d/60x11-common_xdg_path: + Add session script to set xdg path depending on the selected session. + - debian/rules, debian/control: + Add dependencies on x11-common, since pkgbinarymangler moves the docs + there to save some space on the image. + - debian/scripts/vars.*: + + Don't drop wacom from input-all. + + Add -vmmouse to input-all for amd64 and i386. + + Add -qxl to video-all for amd64 and i386. + + Add -geode to video-all for i386. + + Drop video drivers that are likely irrelevant for ARM. + + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo + from xserver-xorg-video-all dependencies. They are unmaintained and + obsolete. + - debian/x11-common.{preinst,postinst,postrm}.in: + Clean up the old failsafe-x files. + + -- Timo Aaltonen Mon, 23 Jan 2012 07:38:32 +0200 + xorg (1:7.6+10) unstable; urgency=high * Fixes for xserver-wrapper: @@ -323,6 +704,100 @@ xorg (1:7.6+8) unstable; urgency=high -- Cyril Brulebois Sun, 14 Aug 2011 23:11:05 +0200 +xorg (1:7.6+7ubuntu7) oneiric; urgency=low + + * Add '/etc/init/failsafe-x.conf' to the list of old failsafe-x config + files to purge. + + -- Timo Aaltonen Fri, 09 Sep 2011 15:33:19 +0300 + +xorg (1:7.6+7ubuntu6) oneiric; urgency=low + + * debian/control: Remove Recommends on xdiagnose as well; apparently it + still causes gtk3 to be included for kubuntu. Derivative distros will + need to opt-in with their seeds if they wish to have X diagnostics + included, or users will have to manually install xdiagnose themselves. + + -- Bryce Harrington Fri, 22 Jul 2011 13:30:15 -0700 + +xorg (1:7.6+7ubuntu5) oneiric; urgency=low + + * debian/control: Move xdiagnose dependency to ubuntu-desktop. + xdiagnose has a gtk dependency, which would pull in gtk3 to kubuntu. + (LP: #814346) + + -- Bryce Harrington Thu, 21 Jul 2011 17:47:16 -0700 + +xorg (1:7.6+7ubuntu4) oneiric; urgency=low + + * debian/control: Add Depends on xdiagnose, to ensure it always gets + installed. + + -- Bryce Harrington Tue, 19 Jul 2011 18:19:24 -0700 + +xorg (1:7.6+7ubuntu3) oneiric; urgency=low + + * debian/rules: + - Reverse the symlinking of /usr/share/doc directories to x11-common. + This should now be handled automatically by pkgbinarymangler, and the + directory symlink now causes file conflicts. (LP: #812665) + + -- Christopher James Halse Rogers Tue, 19 Jul 2011 17:32:01 +1000 + +xorg (1:7.6+7ubuntu2) oneiric; urgency=low + + * debian/local/Xsession.d/60x11-common_xdg_path: Add session script to + set xdg path depending on the selected session (compatible with + lightdm, gdm and kdm now) (LP: #804734) + + -- Didier Roche Wed, 06 Jul 2011 09:39:17 +0200 + +xorg (1:7.6+7ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add apport hook + - Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to + Recommends. + - debian/local/Xsession: + Truncate xsession-errors on startup if too big + - debian/local/Xsession.d/20x11-common_process-args: + Add support for session command containing args. + - debian/local/Xsession.d/60x11-common_localhost: + Authorise all processes running with the user's credentials to connect + to the server. + - debian/rules, debian/control: + Add dependencies on x11-common, and symlink /usr/share/doc directories + of all packages to x11-common's. + - debian/scripts/vars.*: + + Don't drop wacom from input-all. + + Add -vmmouse to input-all for amd64 and i386. + + Add -qxl to video-all for amd64 and i386. + + Add -geode to video-all for i386. + + Drop video drivers that are likely irrelevant for ARM. + - debian/xserver-xorg.postinst.in: Also migrate users from psb → vesa. + + [ Bryce Harrington ] + * apport/source_xorg.py: + - Move Failsafe-X out of the xorg package to xdiagnose + (LP: #480744) + - Simplify answers for bug reporters filing post-release reports. + (LP: #778758) + - Remove attach_drm_info(). This is useful info but we use it very + infrequently, and it is already available in other log files. But the + call makes bug reports a bit cluttered since it adds a lot of lines to + the report itself. + + [ Timo Aaltonen ] + * rules: A stampfile generation was commented out by mistake, uncomment + it. + * Rework the x11-common.{postinst,postrm,preinst} failsafe conffile + handling, the previous ones added in 1:7.6+4ubuntu1 were wrong too. + * scripts/vars.{amd64,i386,powerpc}: Remove apm, ark, chips, i128, i740, + rendition, s3virge, tseng, voodoo from xserver-xorg-video-all + dependencies. They are unmaintained and obsolete. + + -- Timo Aaltonen Tue, 14 Jun 2011 15:39:40 +0300 + xorg (1:7.6+7) unstable; urgency=low * Remove long obsolete XF86Config-4 on purge (Closes: #610450). Thanks, diff -pruN 1:7.7+19/debian/control 1:7.7+19ubuntu15/debian/control --- 1:7.7+19/debian/control 2017-05-03 09:38:16.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/control 2020-10-09 08:17:12.000000000 +0000 @@ -1,7 +1,8 @@ Source: xorg Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu X-SWAT +XSBC-Original-Maintainer: Debian X Strike Force Standards-Version: 3.9.8 Build-Depends: dpkg (>= 1.16.1), @@ -17,6 +18,7 @@ Package: x11-common Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2) +Breaks: nux-tools (<< 4.0.8+18.10.20180613.3-0ubuntu1) Description: X Window System (X.Org) infrastructure x11-common contains the filesystem infrastructure required for further installation of the X Window System in any configuration; it does not @@ -34,15 +36,19 @@ Architecture: any Depends: xserver-xorg-core (>= 2:1.17.2-2), xserver-xorg-legacy [!linux-any], - xserver-xorg-video-all | xorg-driver-video, xserver-xorg-input-all | xorg-driver-input, ${shlibs:Depends}, ${misc:Depends}, xkb-data (>= 1.4), - x11-xkb-utils + x11-xkb-utils, + python3-apport, Recommends: libgl1-mesa-dri, + mesa-vulkan-drivers, xserver-xorg-legacy [linux-any], + xserver-xorg-video-all, +Breaks: xdiagnose (<< 3.8.8) +Replaces: xdiagnose (<< 3.8.8) Provides: xserver Description: X.Org X server This package depends on the full suite of the server and drivers for the @@ -60,8 +66,10 @@ Depends: xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32], ${misc:Depends}, Recommends: - xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32], xserver-xorg-video-qxl [amd64 i386 x32], + xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32], +Suggests: + xserver-xorg-video-geode [i386], Replaces: xserver-xorg-driver-all Conflicts: xserver-xorg-driver-all Description: X.Org X server -- output driver metapackage @@ -88,13 +96,10 @@ Package: xorg Architecture: any Depends: xserver-xorg (>= ${binary:Version}), - libgl1-mesa-glx | libgl1, - libgl1-mesa-dri, - libglu1-mesa, + libgl1-mesa-glx | libgl1 [!armhf], + libgl1-mesa-dri [!armhf], + libglu1-mesa [!armhf], xfonts-base (>= 1:1.0.0-1), - xfonts-100dpi (>= 1:1.0.0-1), - xfonts-75dpi (>= 1:1.0.0-1), - xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, @@ -105,11 +110,16 @@ Depends: xfonts-utils, xkb-data, xorg-docs-core, - xterm | x-terminal-emulator, + gnome-terminal | xterm | x-terminal-emulator, ${misc:Depends}, + xinput, +Recommends: + xfonts-scalable (>= 1:1.0.0-1), Provides: x-window-system, x-window-system-core Suggests: xorg-docs, + xfonts-100dpi (>= 1:1.0.0-1), + xfonts-75dpi (>= 1:1.0.0-1), x11-xfs-utils, Description: X.Org X Window System This metapackage provides the components for a standalone @@ -157,29 +167,7 @@ Depends: libxvmc-dev, libxxf86dga-dev, libxxf86vm-dev, - x11proto-bigreqs-dev, - x11proto-composite-dev, - x11proto-core-dev, - x11proto-damage-dev, - x11proto-dmx-dev, - x11proto-fixes-dev, - x11proto-fonts-dev, - x11proto-gl-dev, - x11proto-input-dev, - x11proto-kb-dev, - x11proto-randr-dev, - x11proto-record-dev, - x11proto-render-dev, - x11proto-resource-dev, - x11proto-scrnsaver-dev, - x11proto-video-dev, - x11proto-xcmisc-dev, - x11proto-xext-dev, - x11proto-xf86bigfont-dev, - x11proto-xf86dga-dev, - x11proto-xf86dri-dev, - x11proto-xf86vidmode-dev, - x11proto-xinerama-dev, + x11proto-dev, xserver-xorg-dev, xtrans-dev, ${misc:Depends}, diff -pruN 1:7.7+19/debian/local/Xsession 1:7.7+19ubuntu15/debian/local/Xsession --- 1:7.7+19/debian/local/Xsession 2016-11-23 07:30:35.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/local/Xsession 2020-10-09 08:17:12.000000000 +0000 @@ -74,6 +74,12 @@ else errormsg "unable to create X session log/error file; aborting." fi +# truncate ERRFILE if it is too big to avoid disk usage DoS +if [ "`stat -c%s \"$ERRFILE\"`" -gt 500000 ]; then + T=`mktemp -p "$HOME"` + tail -c 500000 "$ERRFILE" > "$T" && mv -f "$T" "$ERRFILE" || rm -f "$T" +fi + exec >>"$ERRFILE" 2>&1 echo "$PROGNAME: X session started for $LOGNAME at $(date)" diff -pruN 1:7.7+19/debian/local/Xsession.d/20x11-common_process-args 1:7.7+19ubuntu15/debian/local/Xsession.d/20x11-common_process-args --- 1:7.7+19/debian/local/Xsession.d/20x11-common_process-args 2016-11-23 07:30:35.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/local/Xsession.d/20x11-common_process-args 2020-10-09 08:17:12.000000000 +0000 @@ -45,7 +45,7 @@ case $# in ;; *) # Specific program was requested. - STARTUP_FULL_PATH=$(/usr/bin/which "$1" || true) + STARTUP_FULL_PATH=$(/usr/bin/which "${1%% *}" || true) if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then if [ -x "$STARTUP_FULL_PATH" ]; then STARTUP="$1" diff -pruN 1:7.7+19/debian/local/Xsession.d/60x11-common_xdg_path 1:7.7+19ubuntu15/debian/local/Xsession.d/60x11-common_xdg_path --- 1:7.7+19/debian/local/Xsession.d/60x11-common_xdg_path 1970-01-01 00:00:00.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/local/Xsession.d/60x11-common_xdg_path 2020-10-09 08:17:12.000000000 +0000 @@ -0,0 +1,25 @@ +# This file is sourced by Xsession(5), not executed. +# Add additional xdg paths depending on selected desktop session + +DEFAULT_XDG_CONFIG_DIRS='/etc/xdg' +DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/' +if [ -n "$DESKTOP_SESSION" ]; then + # readd default if was empty + if [ -z "$XDG_CONFIG_DIRS" ]; then + XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$DESKTOP_SESSION":"$DEFAULT_XDG_CONFIG_DIRS" + elif [ -n "${XDG_CONFIG_DIRS##*$DEFAULT_XDG_CONFIG_DIRS/xdg-$DESKTOP_SESSION*}" ]; then + XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$DESKTOP_SESSION":"$XDG_CONFIG_DIRS" + fi + export XDG_CONFIG_DIRS + # gnome is already added if gnome-session installed + if [ "$DESKTOP_SESSION" != "gnome" ]; then + if [ -z "$XDG_DATA_DIRS" ]; then + XDG_DATA_DIRS="$DEFAULT_XDG_DATA_DIRS" + fi + if [ -n "${XDG_DATA_DIRS##*/usr/share/$DESKTOP_SESSION*}" ]; then + XDG_DATA_DIRS=/usr/share/"$DESKTOP_SESSION":"$XDG_DATA_DIRS" + fi + export XDG_DATA_DIRS + fi +fi + diff -pruN 1:7.7+19/debian/rules 1:7.7+19ubuntu15/debian/rules --- 1:7.7+19/debian/rules 2016-11-23 07:30:35.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/rules 2020-10-09 08:17:12.000000000 +0000 @@ -1,7 +1,13 @@ #!/usr/bin/make -f +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) + BUILD_PACKAGES += -Nxorg -Nxserver-xorg -Nxserver-xorg-input-all -Nxserver-xorg-video-all +endif + %: - dh $@ + dh $@ $(BUILD_PACKAGES) override_dh_auto_clean: $(MAKE) -C xsf-docs clean diff -pruN 1:7.7+19/debian/source_xorg.py 1:7.7+19ubuntu15/debian/source_xorg.py --- 1:7.7+19/debian/source_xorg.py 1970-01-01 00:00:00.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/source_xorg.py 2020-10-09 08:17:12.000000000 +0000 @@ -0,0 +1,684 @@ +#!/usr/bin/python3 + +'''Xorg Apport interface + +Copyright (C) 2007-2012 Canonical Ltd. +Author: Bryce Harrington + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. + +Testing: APPORT_STAGING="yes" +''' + +from __future__ import absolute_import, print_function, unicode_literals + +import re +import sys +import glob +import os.path +import subprocess +from apport.hookutils import * + +has_xorglog = False +try: + from xdiagnose.xorglog import XorgLog + has_xorglog = True +except ImportError: + pass + +has_launchpad = False +try: + from launchpadlib.launchpad import Launchpad + has_launchpad = True +except ImportError: + pass + +core_x_packages = [ + 'xorg', 'xorg-server', 'xserver-xorg-core', 'mesa' + ] +video_packages = [ + 'xserver-xorg-video-intel', 'xserver-xorg-video-nouveau', 'xserver-xorg-video-ati', + ] +opt_debug = False + +###### +# +# Apport helper routines +# +###### +def debug(text): + if opt_debug: + sys.stderr.write("%s\n" %(text)) + +def is_number(s): + try: + float(s) + return True + except ValueError: + return False + +def retrieve_ubuntu_release_statuses(): + ''' + Attempts to access launchpad to get a mapping of Ubuntu releases to status. + + Returns a dictionary of ubuntu release keywords to their current status, + or None in case of a failure reading launchpad. + ''' + releases = { } + if not has_launchpad: + return None + try: + lp = Launchpad.login_anonymously('apport', 'production') + d = lp.distributions['ubuntu'] + for series in d.series: + releases[series.name] = series.status + except: + releases = None + return releases + +def installed_version(pkg): + ''' + Queries apt for the version installed at time of filing + ''' + script = subprocess.Popen(['apt-cache', 'policy', pkg], stdout=subprocess.PIPE) + output = script.communicate()[0] + return output.split('\n')[1].replace("Installed: ", "") + +def is_process_running(proc): + ''' + Determine if process has a registered process id + ''' + log = command_output(['pidof', proc]) + if not log or log[:5] == "Error" or len(log)<1: + return False + return True + +def is_xorg_keyboard_package(pkg): + if (pkg == 'xkeyboard-config' or + pkg == 'xkb-data'): + return True + else: + return False + +def is_xorg_input_package(pkg): + if (is_xorg_keyboard_package(pkg) or + pkg[:18] == 'xserver-xorg-input' or + pkg[:10] == 'xf86-input'): + return True + else: + return False + +def is_xorg_video_package(pkg): + if (pkg[:18] == 'xserver-xorg-video' or + pkg[:6] == 'nvidia' or + pkg[:10] == 'xf86-video'): + return True + else: + return False + +def nonfree_graphics_module(module_list = '/proc/modules'): + ''' + Check loaded modules to see if a proprietary graphics driver is loaded. + Return the first such driver found. + ''' + try: + mods = [l.split()[0] for l in open(module_list)] + except IOError: + return None + + for m in mods: + if m == "nvidia": + return m + +def attach_command_output(report, command_list, key): + debug(" %s" %(' '.join(command_list))) + log = command_output(command_list) + if not log or log[:5] == "Error": + return + report[key] = log + +def retval(command_list): + ''' + Call the command and return the command exit code + ''' + return subprocess.call( + command_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + +def ubuntu_variant_name(): + ''' + Detect if system runs kubuntu by looking for kdesudo or ksmserver + + Returns 'ubuntu' or 'kubuntu' as appropriate. + ''' + if (retval(['which', 'kdesudo']) == 0 and + retval(['pgrep', '-x', '-u', str(os.getuid()), 'ksmserver']) == 0): + return "kubuntu" + else: + return "ubuntu" + +def ubuntu_code_name(): + ''' + Return the LSB ubuntu release code name, 'dapper', 'natty', etc. + ''' + debug(" lsb_release -sc") + code_name = command_output(['lsb_release','-sc']) + if code_name[:5] == "Error": + return None + return code_name + +###### +# +# Supportability tests +# +###### + +def check_is_supported(report, ui=None): + ''' + Bug reports against the development release are higher priority than + ones filed against already released versions. We steer reporters of + the latter towards technical support resources, which are better geared + for helping end users solve problems with their installations. + ''' + distro_codename = ubuntu_code_name() + report['DistroCodename'] = distro_codename + report['DistroVariant'] = ubuntu_variant_name() + report['Tags'] += ' ' + report['DistroVariant'] + + if not ui: + return + + # Look up status of this and other releases + release_status = retrieve_ubuntu_release_statuses() + if not release_status or not report['DistroCodename']: + # Problem accessing launchpad, can't tell anything about status + # so assume by default that it's supportable. + return True + status = release_status.get(distro_codename, "Unknown") + + if status == "Active Development": + # Allow user to set flags for things that may help prioritize support + response = ui.choice( + "Thank you for testing the '%s' development version of Ubuntu.\n" + "You may mark any of the following that apply to help us better\n" + "process your issue." %(distro_codename), + [ + "Regression", + "Has happened more than once", + "I can reproduce the bug", + "I know a workaround", + "I know the fix for this", + ], + multiple=True + ) + if response == None: + return False + if 0 in response: + # TODO: Prompt for what type of regression and when it started + # Perhaps parse dpkg.log for update dates + report['Tags'] += ' regression' + if 1 not in response: + report['Tags'] += ' single-occurrence' + if 2 in response: + report['Tags'] += ' reproducible' + if 3 in response: + report['Tags'] += ' has-workaround' + if 4 in response: + report['Tags'] += ' has-fix' + return True + + elif status == "Obsolete": + ui.information("Sorry, the '%s' version of Ubuntu is obsolete, which means the developers no longer accept bug reports about it." %(distro_codename)) + report['UnreportableReason'] = 'Unsupported Ubuntu Release' + return False + + return True + +def check_is_reportable(report, ui=None): + '''Checks system to see if there is any reason the configuration is not + valid for filing bug reports''' + + version_signature = report.get('ProcVersionSignature', '') + if version_signature and not version_signature.startswith('Ubuntu '): + report['UnreportableReason'] = 'The running kernel is not an Ubuntu kernel: %s' %version_signature + return False + + bios = report.get('dmi.bios.version', '') + if bios.startswith('VirtualBox '): + report['SourcePackage'] = "virtualbox-ose" + return False + + product_name = report.get('dmi.product.name', '') + if product_name.startswith('VMware '): + report['UnreportableReason'] = 'VMware is installed. If you upgraded X recently be sure to upgrade vmware to a compatible version.' + return False + + if os.path.exists('/var/log/nvidia-installer.log'): + # User has installed nVidia drivers manually at some point. + # This can cause problems, although the packaging scripts should prevent this situation now. + attach_file(report, '/var/log/nvidia-installer.log', 'nvidia-installer.log') + report['Tags'] += ' ' + 'possible-manual-nvidia-install' + + return True + +###### +# +# Attach relevant data files +# +###### + +def attach_dkms_info(report, ui=None): + ''' + DKMS is the dynamic kernel module service, for rebuilding modules + against a new kernel on the fly, during boot. Occasionally this fails + such as when installing/upgrading with proprietary video drivers. + ''' + if os.path.lexists('/var/lib/dkms'): + # Gather any dkms make.log files for proprietary drivers + for logfile in glob.glob("/var/lib/dkms/*/*/build/make.log"): + attach_file(report, logfile, "make.log") + attach_command_output(report, ['dkms', 'status'], 'DkmsStatus') + +def attach_dist_upgrade_status(report, ui=None): + ''' + This routine indicates whether a system was upgraded from a prior + release of ubuntu, or was a fresh install of this release. + ''' + attach_file_if_exists(report, "/var/log/dpkg.log", "DpkgLog") + if os.path.lexists('/var/log/dist-upgrade/main.log'): + attach_command_output( + report, + ['tail', '-n', '1', '/var/log/dist-upgrade/main.log'], + 'DistUpgraded') + return True + else: + report['DistUpgraded'] = 'Fresh install' + return False + +def attach_graphic_card_pci_info(report, ui=None): + ''' + Extracts the device system and subsystem IDs for the video card. + Note that the user could have multiple video cards installed, so + this may return a multi-line string. + ''' + info = '' + display_pci = pci_devices(PCI_DISPLAY) + for paragraph in display_pci.split('\n\n'): + for line in paragraph.split('\n'): + if ':' not in line: + continue + m = re.match(r'(.*?):\s(.*)', line) + if not m: + continue + key, value = m.group(1), m.group(2) + value = value.strip() + key = key.strip() + if "VGA compatible controller" in key: + info += "%s\n" % (value) + elif key == "Subsystem": + info += " %s: %s\n" %(key, value) + report['GraphicsCard'] = info + +def attach_xorg_package_versions(report, ui=None): + ''' + Gathers versions for various X packages of interest + ''' + for package in [ + "xserver-xorg-core", + "libgl1-mesa-glx", + "libgl1-mesa-dri", + "libdrm2", + "compiz", + "xserver-xorg-input-evdev", + "xserver-xorg-video-intel", + "xserver-xorg-video-ati", + "xserver-xorg-video-nouveau"]: + report['version.%s' %(package)] = package_versions(package) + +def attach_xorg_info(report, ui=None): + ''' + Attaches basic xorg debugging info + ''' + from pathlib import Path + HomeXorgLog = os.path.join(str(Path.home()), '.local/share/xorg/Xorg.0.log') + + attach_file_if_exists(report, '/var/log/boot.log', 'BootLog') + attach_file_if_exists(report, '/var/log/plymouth-debug.log', 'PlymouthDebug') + attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf') + if os.path.exists(HomeXorgLog) : + attach_file_if_exists(report, HomeXorgLog, 'XorgLog') + attach_file_if_exists(report, HomeXorgLog + '.old', 'XorgLogOld') + else: + attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog') + attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld') + + if os.path.lexists('/var/log/Xorg.0.log') and has_xorglog: + try: + xlog = XorgLog('/var/log/Xorg.0.log') + report['xserver.bootTime'] = xlog.boot_time + report['xserver.version'] = xlog.xserver_version + report['xserver.logfile'] = xlog.boot_logfile + report['xserver.devices'] = xlog.devices_table() + report['xserver.outputs'] = xlog.outputs_table() + report['xserver.configfile'] = str(xlog.xorg_conf_path) + report['xserver.errors'] = "\n".join(xlog.errors_filtered()) + if xlog.video_driver is not None: + report['xserver.video_driver'] = xlog.video_driver.lower() + except: + # The parser can fail if the log file has invalid characters (e.g. funky EDID) + pass + + if ui: + display_manager_files = {} + if os.path.lexists('/var/log/lightdm'): + display_manager_files['LightdmLog'] = 'cat /var/log/lightdm/lightdm.log' + display_manager_files['LightdmDisplayLog'] = 'cat /var/log/lightdm/x-0.log' + display_manager_files['LightdmGreeterLog'] = 'cat /var/log/lightdm/x-0-greeter.log' + display_manager_files['LightdmGreeterLogOld'] = 'cat /var/log/lightdm/x-0-greeter.log.old' + + if ui.yesno("Your display manager log files may help developers diagnose the bug, but may contain sensitive information such as your hostname. Do you want to include these logs in your bug report?") == True: + attach_root_command_outputs(report, display_manager_files) + +def attach_2d_info(report, ui=None): + ''' + Attaches various data for debugging modesetting and graphical issues. + ''' + if os.environ.get('DISPLAY'): + # For resolution/multi-head bugs + attach_command_output(report, ['xrandr', '--verbose'], 'Xrandr') + attach_file_if_exists(report, + os.path.expanduser('~/.config/monitors.xml'), + 'MonitorsUser.xml') + attach_file_if_exists(report, + '/etc/gnome-settings-daemon/xrandr/monitors.xml', + 'MonitorsGlobal.xml') + + # For font dpi bugs + attach_command_output(report, ['xdpyinfo'], 'xdpyinfo') + +def attach_3d_info(report, ui=None): + # How are the alternatives set? + attach_command_output(report, ['ls','-l','/etc/alternatives/gl_conf'], 'GlAlternative') + + # Detect software rasterizer + xorglog = report.get('XorgLog', '') + if type(xorglog) is str: + xorglog = xorglog.encode('utf-8') + if len(xorglog)>0: + if b'reverting to software rendering' in xorglog: + report['Renderer'] = 'Software' + elif b'Direct rendering disabled' in xorglog: + report['Renderer'] = 'Software' + + if ui and report.get('Renderer', '') == 'Software': + ui.information("Your system is providing 3D via software rendering rather than hardware rendering. This is a compatibility mode which should display 3D graphics properly but the performance may be very poor. If the problem you're reporting is related to graphics performance, your real question may be why X didn't use hardware acceleration for your system.") + + # Plugins + attach_command_output(report, [ + 'gconftool-2', '--get', '/apps/compiz-1/general/screen0/options/active_plugins'], + 'CompizPlugins') + + # User configuration + attach_command_output(report, [ + 'gconftool-2', '-R', '/apps/compiz-1'], + 'GconfCompiz') + + # Compiz internal state if compiz crashed + if report.get('SourcePackage','Unknown') == "compiz" and "ProcStatus" in report: + compiz_pid = 0 + pid_line = re.search("Pid:\t(.*)\n", report["ProcStatus"]) + if pid_line: + compiz_pid = pid_line.groups()[0] + compiz_state_file = '/tmp/compiz_internal_state%s' % compiz_pid + attach_file_if_exists(report, compiz_state_file, "compiz_internal_states") + + # Remainder of this routine requires X running + if not os.environ.get('DISPLAY'): + return + + # Unity test + if os.path.lexists('/usr/lib/nux/unity_support_test'): + try: + debug(" unity_support_test") + ust = command_output([ + '/usr/lib/nux/unity_support_test', '-p', '-f']) + ust = ust.replace('\x1b','').replace('[0;38;48m','').replace('[1;32;48m','') + report['UnitySupportTest'] = ust + except AssertionError: + report['UnitySupportTest'] = 'FAILED TO RUN' + for testcachefile in glob.glob('/tmp/unity*'): + attach_file(report, testcachefile) + + attach_file_if_exists(report, + os.path.expanduser('~/.drirc'), + 'drirc') + + if (is_process_running('compiz') or + (report.get('SourcePackage','Unknown') == "compiz" and report.get('ProblemType', '') == 'Crash') + ): + report['CompositorRunning'] = 'compiz' + + # Compiz Version + compiz_version = command_output(['compiz', '--version']) + if compiz_version: + version = compiz_version.split(' ')[1] + version = version[:3] + if is_number(version): + compiz_version_string = 'compiz-%s' % version + report['Tags'] += ' ' + compiz_version_string + + # Fullscreen Window Unredirection settings + report['CompositorUnredirectFSW'] = command_output( + ['gsettings','get','org.compiz.composite:/org/compiz/', 'unredirect-fullscreen-windows'] + ) + report['CompositorUnredirectDriverBlacklist'] = command_output( + ['gsettings','get','org.compiz.opengl:/org/compiz/', 'unredirect-driver-blacklist'] + ) + elif is_process_running('kwin'): + report['CompositorRunning'] = 'kwin' + else: + report['CompositorRunning'] = 'None' + +def attach_input_device_info(report, ui=None): + ''' + Gathers data for debugging keyboards, mice, and other input devices. + ''' + # Only collect the following data if X11 is available + if not os.environ.get('DISPLAY'): + return + + # For input device bugs + attach_command_output(report, ['xinput', '--list'], 'xinput') + attach_command_output(report, ['gconftool-2', '-R', '/desktop/gnome/peripherals'], 'peripherals') + + # For keyboard bugs only + if is_xorg_keyboard_package(report.get('SourcePackage','Unknown')): + attach_command_output(report, ['setxkbmap', '-print'], 'setxkbmap') + attach_command_output(report, ['xkbcomp', ':0', '-w0', '-'], 'xkbcomp') + attach_command_output(report, ['locale'], 'locale') + if ui and ui.yesno("Your kernel input device details (lsinput and dmidecode) may be useful to the developers, but gathering it requires admin privileges. Would you like to include this info?") == True: + attach_root_command_outputs(report, { + 'lsinput.txt': 'lsinput', + 'dmidecode.txt': 'dmidecode', + }) + +def attach_nvidia_info(report, ui=None): + ''' + Gathers special files for the nvidia proprietary driver + ''' + # Attach information for upstreaming nvidia binary bugs + if nonfree_graphics_module() != 'nvidia': + return + + report['version.nvidia-graphics-drivers'] = package_versions("nvidia-graphics-drivers-*") + + for logfile in glob.glob('/proc/driver/nvidia/*'): + if os.path.isfile(logfile): + attach_file_if_exists(report, logfile) + + for logfile in glob.glob('/proc/driver/nvidia/*/*'): + if os.path.basename(logfile) != 'README': + attach_file_if_exists(report, logfile) + + if os.path.exists('/usr/bin/nvidia-bug-report.sh'): + if (ui and (ui.yesno("Would you like to generate and attach an NVIDIA bug reporting file? (~/nvidia-bug-report.log.gz)") == True)): + attach_root_command_outputs(report, { + 'NvidiaBugReportLog': 'nvidia-bug-report.sh', + }) + attach_file_if_exists(report, os.path.expanduser('~/nvidia-bug-report.log.gz'), + 'nvidia-bug-report.log.gz') + + if os.environ.get('DISPLAY'): + # Attach output of nvidia-settings --query if we've got a display + # to connect to. + attach_command_output(report, ['nvidia-settings', '-q', 'all'], 'nvidia-settings') + + attach_command_output(report, ['jockey-text', '-l'], 'JockeyStatus') + attach_command_output(report, ['update-alternatives', '--display', 'gl_conf'], 'GlConf') + + # File any X crash with -nvidia involved with the -nvidia bugs + if (report.get('ProblemType', '') == 'Crash' and 'Traceback' not in report): + if report.get('SourcePackage','Unknown') in core_x_packages: + report['SourcePackage'] = "nvidia-graphics-drivers" + +def attach_gpu_hang_info(report, ui): + ''' + Surveys reporter for some additional clarification on GPU freezes + ''' + if not ui: + return + if not 'freeze' in report['Tags']: + return + + if not ui.yesno("Did your system recently lock up and/or require a hard reboot?"): + # If user isn't experiencing freeze symptoms, the remaining questions aren't relevant + report['Tags'] += ' false-gpu-hang' + report['Title'] = report['Title'].replace('GPU lockup', 'False GPU lockup') + return + + text = 'How frequently have you been experiencing lockups like this?' + choices = [ + "I don't know", + "This is the first time", + "Very infrequently", + "Once a week", + "Several times a week", + "Several times a day", + "Continuously", + ] + response = ui.choice(text, choices) + if response == None: + raise StopIteration + report['GpuHangFrequency'] = choices[response[0]] + + # Don't ask more questions if bug is infrequent + if response[0] < 3: + return + + text = "When did you first start experiencing these lockups?" + choices = [ + "I don't know", + "Since before I upgraded", + "Immediately after installing this version of Ubuntu", + "Since a couple weeks or more", + "Within the last week or two", + "Within the last few days", + "Today", + ] + response = ui.choice(text, choices) + if response == None: + raise StopIteration + report['GpuHangStarted'] = choices[response[0]] + + text = "Are you able to reproduce the lockup at will?" + choices = [ + "I don't know", + "Seems to happen randomly", + "Occurs more often under certain circumstances", + "Yes, I can easily reproduce it", + ] + response = ui.choice(text, choices) + if response == None: + raise StopIteration + report['GpuHangReproducibility'] = choices[response[0]] + +def attach_debugging_interest_level(report, ui): + if not ui: + return + + if (report.get('SourcePackage','Unknown') in core_x_packages or + report.get('SourcePackage','Unknown') in video_packages): + text = "Would you be willing to do additional debugging work?" + choices = [ + "I don't know", + "No", + "I just need to know a workaround", + "Yes, if not too technical", + "Yes", + "Yes, including running git bisection searches", + ] + response = ui.choice(text, choices) + if response == None: + raise StopIteration + choice = response[0] + if choice>0: + report['ExtraDebuggingInterest'] = choices[choice] + +def add_info(report, ui): + report.setdefault('Tags', '') + + # Verify the bug is valid to be filed + if check_is_reportable(report, ui) == False: + return False + if check_is_supported(report, ui) == False: + return False + + debug("attach_gpu_hang_info") + attach_gpu_hang_info(report, ui) + debug("attach_xorg_package_versions") + attach_xorg_package_versions(report, ui) + debug("attach_dist_upgrade_status") + attach_dist_upgrade_status(report, ui) + try: + debug("attach_hardware") + attach_hardware(report) + except: + debug("Failed to attach hardware.") + debug("attach_xorg_info") + attach_xorg_info(report, ui) + + pkg = report.get('SourcePackage','Unknown') + if is_xorg_input_package(pkg): + debug("attach_input_device_info") + attach_input_device_info(report, ui) + else: + debug("attach_graphic_card_pci_info") + attach_graphic_card_pci_info(report, ui) + debug("attach_dkms_info") + attach_dkms_info(report, ui) + debug("attach_nvidia_info") + attach_nvidia_info(report, ui) + debug("attach_2d_info") + attach_2d_info(report, ui) + debug("attach_3d_info") + attach_3d_info(report, ui) + + debug("attach_debugging_interest_level") + attach_debugging_interest_level(report, ui) + return True + +## DEBUGING ## +if __name__ == '__main__': + import sys + + opt_debug = True + + report = {} + if not add_info(report, None): + print("Unreportable bug") + sys.exit(1) + for key in report: + print('[%s]\n%s' % (key, report[key])) diff -pruN 1:7.7+19/debian/x11-common.maintscript 1:7.7+19ubuntu15/debian/x11-common.maintscript --- 1:7.7+19/debian/x11-common.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/x11-common.maintscript 2020-10-09 08:17:12.000000000 +0000 @@ -0,0 +1,2 @@ +rm_conffile /etc/X11/Xsession.d/00upstart 1:7.7+19ubuntu5~ upstart +rm_conffile /etc/X11/Xsession.d/99upstart 1:7.7+19ubuntu5~ upstart diff -pruN 1:7.7+19/debian/x11-common.preinst 1:7.7+19ubuntu15/debian/x11-common.preinst --- 1:7.7+19/debian/x11-common.preinst 1970-01-01 00:00:00.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/x11-common.preinst 2020-10-09 08:17:12.000000000 +0000 @@ -0,0 +1,36 @@ +#!bin/sh + +set -e + +rm_conffiles_if_uninstalled() { + PKGNAME="$1" + MAXVERSION="$2" + + if [ "$(dpkg-query --show --showformat='${db:Status-Status}' "$PKGNAME")" != "config-files" ]; then + return 0; + fi + + pkg_version=$(dpkg-query --show --showformat='${Version}' "$PKGNAME") + + if dpkg --compare-versions "$pkg_version" lt-nl "$MAXVERSION"; then + conffiles="$(dpkg-query --show -f='${Conffiles}' "$PKGNAME")" + filepaths="$(echo "$conffiles" | cut -f-2 -d' ')" + + for cfile in $filepaths; do + if [ -f "$cfile" ]; then + echo "Moving obsolete conffile $cfile to $cfile.x11-back..." + mv -f "$cfile" "$cfile".x11-back + fi + done + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" lt 1:7.7+19ubuntu8; then + rm_conffiles_if_uninstalled nux-tools 4.0.8+18.10.20180613.3-0ubuntu1 + fi + ;; +esac + +#DEBHELPER# diff -pruN 1:7.7+19/debian/xserver-xorg.install 1:7.7+19ubuntu15/debian/xserver-xorg.install --- 1:7.7+19/debian/xserver-xorg.install 2016-11-23 07:30:35.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/xserver-xorg.install 2020-10-09 08:17:12.000000000 +0000 @@ -1 +1,2 @@ debian/local/control usr/share/bug/xorg +debian/source_xorg.py usr/share/apport/package-hooks diff -pruN 1:7.7+19/debian/xserver-xorg.links 1:7.7+19ubuntu15/debian/xserver-xorg.links --- 1:7.7+19/debian/xserver-xorg.links 2016-11-23 07:30:35.000000000 +0000 +++ 1:7.7+19ubuntu15/debian/xserver-xorg.links 2020-10-09 08:17:12.000000000 +0000 @@ -1 +1,144 @@ usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg/script +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/xserver-xorg-core.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libdmx.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libdrm.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libfontenc.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libfs.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libice.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libinput.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libpciaccess.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libsm.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libvdpau.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libwacom.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libx11.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxau.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxaw.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxcb.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxcomposite.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxcursor.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxdamage.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxdmcp.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxext.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxfixes.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxfont.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxfontcache.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxft.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxi.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxinerama.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxkbcommon.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxkbfile.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxkbui.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxmu.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxpm.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxrandr.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxrender.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxres.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxss.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxt.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxtst.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxv.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxvmc.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxxf86dga.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_libxxf86vm.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_mesa.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_mesa-demos.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_pixman.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_radeontool.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_wayland.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_weston.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x-kit.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11-apps.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11-session-utils.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11-utils.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11-xfs-utils.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11-xkb-utils.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11-xserver-utils.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-bigreqs.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-composite.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-core.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-damage.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-dmx.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-dri2.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-evie.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-fixes.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-fontcache.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-fonts.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-gl.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-input.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-kb.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-print.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-randr.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-record.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-render.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-resource.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-scrnsaver.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-trap.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-video.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-xcmisc.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-xext.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-xf86bigfont.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-xf86dga.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-xf86dri.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-xf86vidmode.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11proto-xinerama.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xauth.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xbitmaps.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xcb-proto.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xcompmgr.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xcursor-themes.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xdm.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xf86-input-evtouch.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xf86-input-mtrack.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xf86-input-wacom.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xf86-video-displaylink.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xf86-video-msm.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xf86-video-omapfb.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xfonts-core.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xfonts-utils.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xfs.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xft.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xinit.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xinput.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xinput-calibrator.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xkeyboard-config.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xorg-docs.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xorg-options-editor-gtk.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xorg-server.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xorg-sgml-doctools.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xrandr.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xrestop.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-evdev.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-libinput.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-joystick.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-keyboard.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-mouse.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-synaptics.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-vmmouse.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-void.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-wacom.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-ati.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-amdgpu.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-displaylink.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-dummy.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-fbdev.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-geode.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-intel.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-mga.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-nouveau.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-nv.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-openchrome.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-psb.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-qxl.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-r128.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-s3.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-savage.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-siliconmotion.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-sis.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-sisusb.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-trident.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-vesa.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-vmware.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xterm.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xtrace.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xtrans.py +usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xutils-dev.py