xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 151 +--
debian/changelog |8 +-
2 files changed, 112 insertions(+), 47 deletions(-)
New commits:
commit 75be134678ff085b471bc803681f066a3ff999f7
Author: Bryce Harrington br...@canonical.com
Date: Sat Dec 18 01:03:50 2010 -0800
Some apport hook improvements
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index ca89d49..e370823 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -17,6 +17,10 @@ import glob
import subprocess
from apport.hookutils import *
+keyboard_packages = [
+'xorg', 'xkeyboard-config', 'xserver-xorg-input-keyboard',
'xserver-xorg-input-evdev'
+]
+
def installed_version(pkg):
script = subprocess.Popen(['apt-cache', 'policy', pkg],
stdout=subprocess.PIPE)
output = script.communicate()[0]
@@ -36,17 +40,92 @@ def nonfree_graphics_module(module_list = '/proc/modules'):
if m == nvidia or m == fglrx:
return m
+def command_output_quiet(command_list):
+log = command_output(command_list)
+if log[:5] == Error:
+return None
+return log
+
+def root_collect_file_contents(path):
+'''Returns the contents of given file collected as root user'''
+log = root_command_output(['cat', path])
+if log[:5] == Error:
+return Not present
+return log
+
+def retval(command_list):
+return subprocess.call(
+command_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+def ubuntu_variant_name():
+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 command_output(['lsb_release','-sc'])
+
+def attach_dkms_info(report):
+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)
+report['DkmsStatus'] = command_output_quiet(['dkms', 'status'])
+
+def attach_dist_upgrade_status(report):
+if os.path.lexists('/var/log/dist-upgrade/apt.log'):
+report['DistUpgraded'] = command_output_quiet(
+['head', '-n', '1', '/var/log/dist-upgrade/apt.log'])
+return True
+else:
+report['DistUpgraded'] = 'Fresh install'
+return False
+
+def attach_pci_info(report):
+info = ''
+display_pci = pci_devices(PCI_DISPLAY)
+for paragraph in output.split('\n\n'):
+for line in paragraph.split('\n'):
+key, value = line.split(':',1)
+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 check_is_reportable(report):
+'''Checks system to see if there is any reason the configuration is not
+valid for filing bug reports'''
+
+version_signature = report.get('ProcVersionSignature', '')
+if not version_signature.startswith('Ubuntu '):
+report['UnreportableReason'] = _('The running kernel is not an Ubuntu
kernel')
+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 recently be sure to upgrade vmware to a compatible version.')
+return False
+
+return True
+
+
def add_info(report, ui):
tags = []
-# Build System Environment
-codename = command_output(['lsb_release','-sc'])
-tags.append(codename)
-
-report['system'] = distro: Ubuntu\n
-report['system'] += codename:+ codename + \n
-report['system'] += architecture:+
command_output(['uname','-m']) + \n
-report['system'] += kernel: +
command_output(['uname','-r']) + \n
+report['DistroVariant'] = ubuntu_variant_name()
+report['DistroCodename'] = ubuntu_code_name()
+tags.append(report['DistroCodename'])
+tags.append(report['DistroVariant'])
attach_related_packages(report, [
xserver-xorg,
@@ -58,19 +137,7 @@ def add_info(report, ui):
])
# Verify the bug is valid to be filed
-version_signature = report.get('ProcVersionSignature', '')
-if not version_signature.startswith('Ubuntu '):
-report['UnreportableReason'] = _('The running kernel is not an Ubuntu
kernel')
-return
-
-bios = report.get('dmi.bios.version', '')
-if bios.startswith('VirtualBox '):
-report['SourcePackage'] =
Processed: patch to fix the finnish keymap missing some keys
Processing commands for cont...@bugs.debian.org: reassign 606840 xkb-data Bug #606840 [console-setup] installation-report: Keyboard not functioning correctly in the graphical installer Bug #606843 [console-setup] Installation-Report: English language with Finnish location, half of the keys stop working Bug reassigned from package 'console-setup' to 'xkb-data'. Bug reassigned from package 'console-setup' to 'xkb-data'. Bug No longer marked as found in versions console-setup/1.61. Bug No longer marked as found in versions console-setup/1.61. tags 606840 patch Bug #606840 [xkb-data] installation-report: Keyboard not functioning correctly in the graphical installer Bug #606843 [xkb-data] Installation-Report: English language with Finnish location, half of the keys stop working Ignoring request to alter tags of bug #606840 to the same tags previously set Ignoring request to alter tags of bug #606843 to the same tags previously set thanks Stopping processing here. Please contact me if you need assistance. -- 606840: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606840 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.12926702263937.transcr...@bugs.debian.org
Processed: reassign 606840 to console-setup
Processing commands for cont...@bugs.debian.org: reassign 606840 console-setup 1.61 Bug #606840 [xkb-data] installation-report: Keyboard not functioning correctly in the graphical installer Bug #606843 [xkb-data] Installation-Report: English language with Finnish location, half of the keys stop working Bug reassigned from package 'xkb-data' to 'console-setup'. Bug reassigned from package 'xkb-data' to 'console-setup'. Bug #606840 [console-setup] installation-report: Keyboard not functioning correctly in the graphical installer Bug #606843 [console-setup] Installation-Report: English language with Finnish location, half of the keys stop working Bug Marked as found in versions console-setup/1.61. Bug Marked as found in versions console-setup/1.61. thanks Stopping processing here. Please contact me if you need assistance. -- 606840: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606840 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.129267207111742.transcr...@bugs.debian.org
Bug#607395: libx11-data: more compose key mappings
On Sat, Dec 18, 2010 at 00:29:59 +0100, Cyril Brulebois wrote: Hi, Daniel Kahn Gillmor d...@fifthhorseman.net (17/12/2010): I would like to be able to more easily compose the skull and crossbones (☠), up and down arrows (↑,↓), and an umbrella (☂). it would be nice if you could submit those directly upstream, since that's not Debian-specific: https://bugs.freedesktop.org/ Feel free to mark this bug forwarded there once that's done. :) Thanks. Better yet, send a patch to xorg-de...@lists.x.org. Cheers, Julien signature.asc Description: Digital signature
Processed: severity of 606288 is serious, forcibly merging 606288 606340 606348 606720 607119 607300
Processing commands for cont...@bugs.debian.org: severity 606288 serious Bug #606288 [xserver-xorg-video-intel] xserver-xorg-video-intel: No longer finds display; does not allow VT switch (ThinkPad X200) Severity set to 'serious' from 'important' forcemerge 606288 606340 606348 606720 607119 607300 Bug#606288: xserver-xorg-video-intel: No longer finds display; does not allow VT switch (ThinkPad X200) Bug#606340: No devices detected since upgrade to xserver-xorg-video-intel 2:2.13.0-4 Bug#606348: xserver-xorg-video-intel: X refuses to load this driver with an xorg.conf, without it loads Vesa on my LCD monitor Bug#606720: xserver-xorg-video-intel: Resolution is limited to 1280x1024 on vaio z13 instead of 1920x1080 Bug#607119: xserver-xorg-video-intel: [945GME] does not use correct resolution after upgrade from 2.13.0-2 to 2.13.0-4 Bug#607300: regression for 82915G/GV/910GL Forcibly Merged 606288 606340 606348 606720 607119 607300. thanks Stopping processing here. Please contact me if you need assistance. -- 606348: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606348 606288: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606288 607300: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607300 607119: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607119 606720: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606720 606340: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606340 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.129268586612494.transcr...@bugs.debian.org
Processed: notfound 606288 in 2:2.13.0-2
Processing commands for cont...@bugs.debian.org: notfound 606288 2:2.13.0-2 Bug #606288 [xserver-xorg-video-intel] xserver-xorg-video-intel: No longer finds display; does not allow VT switch (ThinkPad X200) Bug #606340 [xserver-xorg-video-intel] No devices detected since upgrade to xserver-xorg-video-intel 2:2.13.0-4 Bug #606348 [xserver-xorg-video-intel] xserver-xorg-video-intel: X refuses to load this driver with an xorg.conf, without it loads Vesa on my LCD monitor Bug #606720 [xserver-xorg-video-intel] xserver-xorg-video-intel: Resolution is limited to 1280x1024 on vaio z13 instead of 1920x1080 Bug #607119 [xserver-xorg-video-intel] xserver-xorg-video-intel: [945GME] does not use correct resolution after upgrade from 2.13.0-2 to 2.13.0-4 Bug #607300 [xserver-xorg-video-intel] regression for 82915G/GV/910GL Bug No longer marked as found in versions xserver-xorg-video-intel/2:2.13.0-2. Bug No longer marked as found in versions xserver-xorg-video-intel/2:2.13.0-2. Bug No longer marked as found in versions xserver-xorg-video-intel/2:2.13.0-2. Bug No longer marked as found in versions xserver-xorg-video-intel/2:2.13.0-2. Bug No longer marked as found in versions xserver-xorg-video-intel/2:2.13.0-2. Bug No longer marked as found in versions xserver-xorg-video-intel/2:2.13.0-2. thanks Stopping processing here. Please contact me if you need assistance. -- 606288: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606288 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.129268624114493.transcr...@bugs.debian.org
xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 11 +++
debian/patches/fail-probe-if-no-kms.diff | 40 --
debian/patches/series|1
src/intel_driver.c | 35 ---
src/intel_module.c | 46 ---
5 files changed, 53 insertions(+), 80 deletions(-)
New commits:
commit a50928e5d6a8e239ae5649c527d7a2df07a557c5
Author: Julien Cristau jcris...@debian.org
Date: Sat Dec 18 20:22:33 2010 +0100
changelog entry
diff --git a/debian/changelog b/debian/changelog
index 47a7170..265e396 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-intel (2:2.13.0-5) UNRELEASED; urgency=low
+
+ * Drop the intel_pci_probe patch from -4 (closes: #606288). This relied on
+i915.ko getting loaded automatically, which doesn't happen if:
+- the kernel is built without CONFIG_DRM_I915_KMS and lacks modaliases, or
+- the user kept obsolete /etc/modprobe.d blacklists around.
+ * Use the patch from upstream instead, which tries to load the kernel driver
+before testing for kms.
+
+ -- Julien Cristau jcris...@debian.org Sat, 18 Dec 2010 20:17:18 +0100
+
xserver-xorg-video-intel (2:2.13.0-4) unstable; urgency=low
[ Julien Cristau ]
commit 20af913400bd0d847f36da4b5253b737335db1d8
Author: Chris Wilson ch...@chris-wilson.co.uk
Date: Sat Oct 2 13:32:58 2010 +0100
Do not claim the PCI device if !KMS
By returning FALSE whilst probing if we can't find a KMS driver, we
allow X to fallback to trying the VESA driver -- rather than failing.
The initial idea for this was by Julien Cristau.
Reported-by: Julien Cristau jcris...@debian.org
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
(cherry picked from commit 455f2939a661764ebb8d1747d44e16a0a8937808)
diff --git a/src/intel_driver.c b/src/intel_driver.c
index d086d94..26bdc6a 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -262,33 +262,6 @@ static void PreInitCleanup(ScrnInfoPtr scrn)
scrn-driverPrivate = NULL;
}
-/*
- * DRM mode setting Linux only at this point... later on we could
- * add a wrapper here.
- */
-static Bool intel_kernel_mode_enabled(ScrnInfoPtr scrn)
-{
- struct pci_device *dev;
- char id[20];
- int ret;
-
- dev =
xf86GetPciInfoForEntity(xf86GetEntityInfo(scrn-entityList[0])-index);
- snprintf(id, sizeof(id),
-pci:%04x:%02x:%02x.%d,
-dev-domain, dev-bus, dev-dev, dev-func);
-
- ret = drmCheckModesettingSupported(id);
- if (ret) {
- if (xf86LoadKernelModule(i915))
- ret = drmCheckModesettingSupported(id);
- }
- /* Be nice to the user and load fbcon too */
- if (!ret)
- (void)xf86LoadKernelModule(fbcon);
-
- return ret == 0;
-}
-
static void intel_check_chipset_option(ScrnInfoPtr scrn)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -513,18 +486,10 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
EntityInfoPtr pEnt;
int flags24;
Gamma zeros = { 0.0, 0.0, 0.0 };
- int drm_mode_setting;
if (scrn-numEntities != 1)
return FALSE;
- drm_mode_setting = intel_kernel_mode_enabled(scrn);
- if (!drm_mode_setting) {
- xf86DrvMsg(scrn-scrnIndex, X_ERROR,
- No kernel modesetting driver detected.\n);
- return FALSE;
- }
-
pEnt = xf86GetEntityInfo(scrn-entityList[0]);
if (flags PROBE_DETECT)
diff --git a/src/intel_module.c b/src/intel_module.c
index 53e1cb6..8fd55ed 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -37,6 +37,8 @@
#include intel_driver.h
#include legacy/legacy.h
+#include xf86drmMode.h
+
static const SymTabRec _intel_chipsets[] = {
{PCI_CHIP_I810,i810},
{PCI_CHIP_I810_DC100, i810-dc100},
@@ -361,6 +363,27 @@ static Bool intel_driver_func(ScrnInfoPtr pScrn,
}
}
+static Bool has_kernel_mode_setting(struct pci_device *dev)
+{
+ char id[20];
+ int ret;
+
+ snprintf(id, sizeof(id),
+pci:%04x:%02x:%02x.%d,
+dev-domain, dev-bus, dev-dev, dev-func);
+
+ ret = drmCheckModesettingSupported(id);
+ if (ret) {
+ if (xf86LoadKernelModule(i915))
+ ret = drmCheckModesettingSupported(id);
+ }
+ /* Be nice to the user and load fbcon too */
+ if (!ret)
+ (void)xf86LoadKernelModule(fbcon);
+
+ return ret == 0;
+}
+
/*
* intel_pci_probe --
*
@@ -373,11 +396,26 @@ static Bool intel_pci_probe (DriverPtrdriver,
struct pci_device *device,
intptr_t match_data)
{
-ScrnInfoPtr scrn = NULL;
+ScrnInfoPtr scrn;
+
+if
