Bug#495267: #495267 xrandr problem with dualhead
Hello, I can confirm the problem on Lenny (2008-11-19) and the workaround helps. If you need any additional information to reproduce just tell me. -- Noèl Köthe noel debian.org Debian GNU/Linux, www.debian.org signature.asc Description: Dies ist ein digital signierter Nachrichtenteil
Processed: Re: Processed (with 1 errors): Re: Bug#484180: mesa: some ASM optimizations must be disabled for non-AMD 64-bit
Processing commands for [EMAIL PROTECTED]: forwarded 484180 https://bugs.freedesktop.org/show_bug.cgi?id=8724 Bug#484180: mesa: some ASM optimizations must be disabled for non-AMD 64-bit Forwarded-to-address changed from http://bugs.freedesktop.org/show_bug.cgi?id=8724 to https://bugs.freedesktop.org/show_bug.cgi?id=8724. merge 484180 487603 Bug#484180: mesa: some ASM optimizations must be disabled for non-AMD 64-bit Bug#487603: xserver-xorg-video-intel: [945GM] crash on Floating Point Exception Merged 484180 487603. kthxbye Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#484180: mesa: some ASM optimizations must be disabled for non-AMD 64-bit
reassign 487603 mesa severity 487603 normal merge 484180 487603 thanks Hi, I have just been bitten by this too; would it be possible to have the fixed version uploaded fairly soon? I guess it's affected by the freeze at the moment? Anyway, I've worked around it with MESA_NO_ASM, but it'd be nice to have the proper fix. I also took the liberty of merging bug #487603 into this one; they're forwarded to the same upstream bug, and they seem to be the same issue. Thanks, Vasilis -- Vasilis Vasaitis A man is well or woe as he thinks himself so. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libdrm: Changes to 'debian-experimental'
.gitignore |4 bsd-core/i915_suspend.c |1 bsd-core/radeon_microcode.h |1 configure.ac | 81 debian/changelog | 12 debian/rules | 11 libdrm/Makefile.am |6 libdrm/intel/Makefile.am | 46 libdrm/intel/intel_bufmgr.c | 207 libdrm/intel/intel_bufmgr.h | 174 libdrm/intel/intel_bufmgr_fake.c | 1522 ++ libdrm/intel/intel_bufmgr_gem.c | 1134 libdrm/intel/intel_bufmgr_priv.h | 175 libdrm/intel/mm.c| 281 + libdrm/intel/mm.h| 96 libdrm/libdrm_lists.h| 87 libdrm/xf86drm.c | 167 libdrm/xf86drm.h |1 libdrm/xf86mm.h | 12 linux-core/drm-gem.txt | 805 +++ linux-core/drm_gem.c | 444 + linux-core/i915_gem.c| 2502 ++ linux-core/i915_gem_debug.c | 202 linux-core/i915_gem_proc.c | 293 + linux-core/i915_gem_tiling.c | 309 + linux-core/i915_opregion.c | 389 + linux-core/i915_suspend.c|1 linux-core/nv50_grctx.h |1 scripts/create_lk_gpu.sh | 58 shared-core/drm.h| 350 + shared-core/drm_pciids.txt | 63 shared-core/i915_dma.c | 316 - shared-core/i915_drm.h | 388 + shared-core/i915_drv.h | 2132 ++--- shared-core/i915_irq.c | 305 - shared-core/i915_suspend.c | 520 ++ shared-core/mach64_dma.c |6 shared-core/nouveau_drm.h| 24 shared-core/nouveau_drv.h| 19 shared-core/nouveau_fifo.c |7 shared-core/nouveau_mem.c| 140 shared-core/nouveau_notifier.c |2 shared-core/nouveau_object.c | 15 shared-core/nouveau_state.c | 171 shared-core/nv04_fifo.c |4 shared-core/nv20_graph.c | 32 shared-core/nv40_graph.c | 10 shared-core/nv50_fifo.c |4 shared-core/nv50_graph.c | 1977 shared-core/nv50_grctx.h | 9232 +++ shared-core/r300_cmdbuf.c| 214 shared-core/r300_reg.h | 229 shared-core/radeon_cp.c | 141 shared-core/radeon_drv.h | 88 shared-core/radeon_irq.c | 57 shared-core/radeon_mem.c |8 shared-core/radeon_state.c | 30 shared-core/xgi_drm.h|4 tests/Makefile.am|6 tests/drmtest.c |2 tests/gem_basic.c| 98 tests/gem_flink.c| 128 tests/gem_mmap.c | 132 tests/gem_readwrite.c| 135 64 files changed, 22799 insertions(+), 3212 deletions(-) New commits: commit 5bf2abb853fdc5723bea205c58ed6473f715841a Author: Timo Aaltonen [EMAIL PROTECTED] Date: Wed Nov 19 15:25:41 2008 +0200 Update the changelog. diff --git a/debian/changelog b/debian/changelog index dfad06f..a1a6489 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.3.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen [EMAIL PROTECTED] Wed, 19 Nov 2008 13:41:16 +0200 + libdrm (2.3.1-1) unstable; urgency=low [ Brice Goglin ] commit 00847dabe0fa5ccf796658f486e8f6f7a77e043b Author: Eric Anholt [EMAIL PROTECTED] Date: Thu Oct 30 11:36:46 2008 -0700 libdrm 2.4.1. diff --git a/configure.ac b/configure.ac index 92507cb..0f7c79e 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AC_PREREQ(2.57) -AC_INIT([libdrm], 2.4.0, [EMAIL PROTECTED], libdrm) +AC_INIT([libdrm], 2.4.1, [EMAIL PROTECTED], libdrm) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2]) commit 4b9826408f65976a1a13387beda748b65e03ec52 Author: Eric Anholt [EMAIL PROTECTED] Date: Thu Oct 30 09:33:07 2008 -0700 intel: Rename dri_ and intel_ symbols to drm_intel_. I wanted to avoid doing this, as it's a bunch of churn, but there was a conflict between the dri_ symbols in libdrm and the symbols that were in Mesa in 7.2, which broke Mesa 7.2 AIGLX when the 2D driver had loaded new libdrm symbols. The new naming was recommended by cworth for giving the code a unique prefix identifying where the code lives. Additionally, take the opportunity to fix up two API mistakes: emit_reloc's arguments were in a nonsensical order, and set_tiling lacked the stride argument that the kernel will want to use soon. API compatibility with released code is maintained using #defines. diff --git a/libdrm/intel/intel_bufmgr.c b/libdrm/intel/intel_bufmgr.c index 92b6046..188eac2 100644 --- a/libdrm/intel/intel_bufmgr.c +++ b/libdrm/intel/intel_bufmgr.c @@ -39,26 +39,26 @@ #include intel_bufmgr.h #include intel_bufmgr_priv.h -/** @file
Processed (with 1 errors): Re: Bug#484180: mesa: some ASM optimizations must be disabled for non-AMD 64-bit
Processing commands for [EMAIL PROTECTED]: reassign 487603 mesa Bug#487603: xserver-xorg-video-intel: [945GM] crash on Floating Point Exception Bug reassigned from package `libgl1-mesa-dri' to `mesa'. severity 487603 normal Bug#487603: xserver-xorg-video-intel: [945GM] crash on Floating Point Exception Severity set to `normal' from `important' merge 484180 487603 Bug#484180: mesa: some ASM optimizations must be disabled for non-AMD 64-bit Bug#487603: xserver-xorg-video-intel: [945GM] crash on Floating Point Exception Mismatch - only Bugs in same state can be merged: Values for `forwarded addr' don't match: #484180 has `http://bugs.freedesktop.org/show_bug.cgi?id=8724'; #487603 has `https://bugs.freedesktop.org/show_bug.cgi?id=8724' thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libdrm: Changes to 'debian-experimental'
debian/changelog | 10
shared-core/i915_dma.c | 1280 ---
shared-core/i915_drv.h | 2123 --
shared-core/i915_irq.c | 1010 --
shared-core/i915_mem.c | 386 -
shared-core/imagine_drv.h | 43
shared-core/mach64_dma.c | 1778 -
shared-core/mach64_drv.h | 859 --
shared-core/mach64_irq.c | 159
shared-core/mach64_state.c | 910 --
shared-core/mga_dma.c | 1161 ---
shared-core/mga_drv.h | 691 -
shared-core/mga_irq.c | 182
shared-core/mga_state.c| 1139 ---
shared-core/mga_ucode.h|11645 -
shared-core/mga_warp.c | 198
shared-core/nouveau_dma.c | 172
shared-core/nouveau_drv.h | 621 -
shared-core/nouveau_fifo.c | 601 -
shared-core/nouveau_irq.c | 568 -
shared-core/nouveau_mem.c | 872 --
shared-core/nouveau_notifier.c | 165
shared-core/nouveau_object.c | 1178 ---
shared-core/nouveau_state.c| 871 --
shared-core/nouveau_swmthd.c | 191
shared-core/nv04_fb.c | 23
shared-core/nv04_fifo.c| 138
shared-core/nv04_graph.c | 516 -
shared-core/nv04_instmem.c | 159
shared-core/nv04_mc.c | 22
shared-core/nv04_timer.c | 53
shared-core/nv10_fb.c | 25
shared-core/nv10_fifo.c| 169
shared-core/nv10_graph.c | 914 --
shared-core/nv20_graph.c | 913 --
shared-core/nv40_fb.c | 62
shared-core/nv40_fifo.c| 209
shared-core/nv40_graph.c | 2193 --
shared-core/nv40_mc.c | 38
shared-core/nv50_fifo.c| 343
shared-core/nv50_graph.c | 315
shared-core/nv50_instmem.c | 324
shared-core/nv50_mc.c | 43
shared-core/nv_drv.h | 52
shared-core/r128_cce.c | 933 --
shared-core/r128_drv.h | 525 -
shared-core/r128_irq.c | 116
shared-core/r128_state.c | 1681
shared-core/r300_cmdbuf.c | 1198 ---
shared-core/r600_microcode.h |14275 -
shared-core/radeon_cp.c| 1792 -
shared-core/radeon_drv.h | 1470
shared-core/radeon_irq.c | 390 -
shared-core/radeon_mem.c | 302
shared-core/radeon_microcode.h | 1844 -
shared-core/radeon_state.c | 3263 -
shared-core/savage_bci.c | 1092 ---
shared-core/savage_drv.h | 575 -
shared-core/savage_state.c | 1165 ---
shared-core/sis_drv.h | 90
shared-core/sis_ds.c | 299
shared-core/sis_mm.c | 386 -
shared-core/tdfx_drv.h | 47
shared-core/via_dma.c | 763 --
shared-core/via_drv.c | 157
shared-core/via_drv.h | 211
shared-core/via_ds.c | 274
shared-core/via_irq.c | 403 -
shared-core/via_map.c | 139
shared-core/via_mm.c | 347
shared-core/via_verifier.c | 1121 ---
shared-core/via_video.c| 93
tests/Makefile.in | 611 +
73 files changed, 620 insertions(+), 70266 deletions(-)
New commits:
commit aa22f2e494ca7b7bdf60a9cdddce3f2ddccd4e49
Author: Julien Cristau [EMAIL PROTECTED]
Date: Sun Oct 19 14:56:43 2008 +0200
Add missing Makefile.in
diff --git a/tests/Makefile.in b/tests/Makefile.in
new file mode 100644
index 000..3c18824
--- /dev/null
+++ b/tests/Makefile.in
@@ -0,0 +1,611 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
[EMAIL PROTECTED]@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR) cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = dristat$(EXEEXT) drmstat$(EXEEXT)
+TESTS = auth$(EXEEXT) openclose$(EXEEXT) getversion$(EXEEXT) \
+ getclient$(EXEEXT) getstats$(EXEEXT) lock$(EXEEXT) \
+ setversion$(EXEEXT) updatedraw$(EXEEXT)
+EXTRA_PROGRAMS = $(am__EXEEXT_1)
+subdir = tests
+DIST_COMMON = $(srcdir)/Makefile.am
xserver-xorg-input-evdev: Changes to 'debian-experimental'
configure.ac |2
debian/changelog |6 ++
src/evdev.c | 114 ++-
src/evdev.h |4 +
4 files changed, 124 insertions(+), 2 deletions(-)
New commits:
commit 7a0c4edcbf434043eb022c87086f97fb5ef398cb
Author: Timo Aaltonen [EMAIL PROTECTED]
Date: Wed Nov 19 15:37:09 2008 +0200
Update the changelog.
diff --git a/debian/changelog b/debian/changelog
index 9d09e19..b672544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen [EMAIL PROTECTED] Wed, 19 Nov 2008 15:34:39 +0200
+
xserver-xorg-input-evdev (1:2.0.99.3-1) experimental; urgency=low
[ Timo Aaltonen ]
commit b879ae73510ad733c266fba80e0ec4b0f903e71b
Author: Peter Hutterer [EMAIL PROTECTED]
Date: Mon Nov 17 09:27:25 2008 +1000
evdev 2.1
diff --git a/configure.ac b/configure.ac
index f1d06cd..f668d1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
-2.0.99.3,
+2.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit 53566b7d4d7e641df4db5720ae9132eb4c812c84
Author: Peter Hutterer [EMAIL PROTECTED]
Date: Mon Nov 17 10:03:11 2008 +1000
Store device file's minor/major to avoid duplicate devices.
Devices added that use the same min/maj as an already added device are
ignored
by the driver. This way users can have an xorg.conf entry on
/dev/input/by-id/blahblah and not get the same device added by HAL.
Signed-off-by: Peter Hutterer [EMAIL PROTECTED]
(cherry picked from commit 63af314368cec47b6b8266db331f2c820e7a071f)
diff --git a/src/evdev.c b/src/evdev.c
index 3051531..25325a3 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -32,6 +32,7 @@
#include X11/keysym.h
+#include sys/stat.h
#include unistd.h
#include errno.h
#include fcntl.h
@@ -51,6 +52,10 @@
#include evdev-properties.h
#endif
+#ifndef MAXDEVICES
+#include inputstr.h /* for MAX_DEVICES */
+#define MAXDEVICES MAX_DEVICES
+#endif
/* 2.4 compatibility */
#ifndef EVIOCGRAB
@@ -112,6 +117,88 @@ static Atom prop_calibration = 0;
static Atom prop_swap = 0;
#endif
+/* All devices the evdev driver has allocated and knows about.
+ * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK)
+ * cannot be used by evdev, leaving us with a space of 2 at the end. */
+static EvdevPtr evdev_devices[MAXDEVICES] = {0};
+
+static int
+EvdevGetMajorMinor(InputInfoPtr pInfo)
+{
+struct stat st;
+
+if (fstat(pInfo-fd, st) == -1)
+{
+xf86Msg(X_ERROR, %s: stat failed (%s). cannot check for
duplicates.\n,
+pInfo-name, strerror(errno));
+return 0;
+}
+
+return st.st_rdev;
+}
+
+/**
+ * Return TRUE if one of the devices we know about has the same min/maj
+ * number.
+ */
+static BOOL
+EvdevIsDuplicate(InputInfoPtr pInfo)
+{
+EvdevPtr pEvdev = pInfo-private;
+EvdevPtr* dev = evdev_devices;
+
+if (pEvdev-min_maj)
+{
+while(*dev)
+{
+if ((*dev) != pEvdev
+(*dev)-min_maj
+(*dev)-min_maj == pEvdev-min_maj)
+return TRUE;
+dev++;
+}
+}
+return FALSE;
+}
+
+/**
+ * Add to internal device list.
+ */
+static void
+EvdevAddDevice(InputInfoPtr pInfo)
+{
+EvdevPtr pEvdev = pInfo-private;
+EvdevPtr* dev = evdev_devices;
+
+while(*dev)
+dev++;
+
+*dev = pEvdev;
+}
+
+/**
+ * Remove from internal device list.
+ */
+static void
+EvdevRemoveDevice(InputInfoPtr pInfo)
+{
+EvdevPtr pEvdev = pInfo-private;
+EvdevPtr *dev = evdev_devices;
+int count = 0;
+
+while(*dev)
+{
+count++;
+if (*dev == pEvdev)
+{
+memmove(dev, dev + 1,
+sizeof(evdev_devices) - (count * sizeof(EvdevPtr)));
+break;
+}
+dev++;
+}
+}
+
static void
SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
@@ -205,6 +292,7 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
DisableDevice(pInfo-dev);
close(pInfo-fd);
pInfo-fd = -1;
+pEvdev-min_maj = 0; /* don't hog the device */
}
pEvdev-reopen_left = 0;
return 0;
@@ -217,6 +305,7 @@ EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg)
xf86Msg(X_ERROR, %s: Failed to reopen device after %d attempts.\n,
pInfo-name, pEvdev-reopen_attempts);
DisableDevice(pInfo-dev);
+pEvdev-min_maj = 0; /* don't hog the device */
return 0;
}
@@ -1024,6 +1113,14 @@ EvdevOn(DeviceIntPtr device)
pEvdev-reopen_timer = TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo);
} else
{
+pEvdev-min_maj = EvdevGetMajorMinor(pInfo);
+if
Bug#506212: xserver-xorg: After upgrade, X starts but there is no keyboard, user stuck
Package: xserver-xorg Version: 1:7.4~4 Severity: normal After an upgrade, I restarted X and it came up but with no keyboard at all. After powering off and rebooting without X, I found this in Xorg.0.log: (WW) AllowEmptyInput is on, devices using drivers 'kbd' or 'mouse' will be disabled. After some googling, I found that I could use Option AllowEmptyInput false and then everything is fine again. I don't complain - experimental can pull such stunts of course. But this needs fixing before it gets to stable, where users expect their old config to work, or new necessary options to be added automatically. The information I found suggests that this option might be needed when the keyboard is specified in xorg.conf, rather than autodetected. I think I always will need some keyboard information in xorg.xonf, because I use a norwegian keyboard layout. This surely cannot be autodetected, even though the keyboard device is trivially detectable. It is the same for every other non-english user. -- Package-specific info: Contents of /var/lib/x11/X.roster: xserver-xorg /etc/X11/X target does not match checksum in /var/lib/x11/X.md5sum. X server symlink status: lrwxrwxrwx 1 root root 13 26 okt. 2007 /etc/X11/X - /usr/bin/Xorg -rwxr-xr-x 1 root root 1797392 12 nov. 14:14 /usr/bin/Xorg Contents of /var/lib/x11/xorg.conf.roster: xserver-xorg VGA-compatible devices on PCI bus: 01:00.0 VGA compatible controller: nVidia Corporation Quadro NVS 135M (rev a1) /etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum. Xorg X server configuration file status: -rw-r--r-- 1 root root 5342 19 nov. 13:07 /etc/X11/xorg.conf Contents of /etc/X11/xorg.conf: # nvidia-xconfig: X configuration file generated by nvidia-xconfig # nvidia-xconfig: version 1.0 ([EMAIL PROTECTED]) Sat May 12 15:12:41 PDT 2007 # xorg.conf (xorg X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. # # Edit this file with caution, and see the xorg.conf manual page. # (Type man xorg.conf at the shell prompt.) # # This file is automatically updated on xserver-xorg package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xorg # package. # # If you have edited this file but would like it to be automatically updated # again, run the following command: # sudo dpkg-reconfigure -phigh xserver-xorg #God ide? Section ServerFlags #Allow ctrl+alt+Fn - in theory but doesn't actually work. #vt switch fail when started from xdm, works when started from startx # Option DontVTSwitch off #Get the console switching back? #strangely, this works for xd but is not needed for startx ??? #This option also kills autorepeat and is therefore unuseable #Option XkbDisable true #Attempt to fix the mysteriously lost keyboard Option AllowEmptyInput false EndSection Section ServerLayout Identifier Default Layout Screen Default Screen 0 0 InputDevice Generic Keyboard #Touchpad before other mouse, according to: ##http://gentoo-wiki.com/HARDWARE_Synaptics_Touchpad #now also CorePointer InputDevice Synaptics Touchpad CorePointer InputDevice Configured Mouse EndSection #Section Module #nonexistantLoadtype1 #Load glx #Load dbe #Load extmod #Load fbdevhw #Load record #Load freetype #Virker ikke? #EndSection Section InputDevice Identifier Generic Keyboard Driver kbd Option CoreKeyboard Option XkbRules xorg Option XkbModel pc105 Option XkbLayout no EndSection Section InputDevice Identifier Configured Mouse Driver mouse Option Buttons 10 Option ZaxisMapping 4 5 6 7 Option SendCoreEvents true Option Device /dev/input/mice Option Protocol ImPS/2 Option Emulate3Buttons true EndSection Section InputDevice Identifier Synaptics Touchpad Driver synaptics Option Buttons 10 Option ZaxisMapping 4 5 6 7 Option ButtonMapping 2 3 4 Option SendCoreEvents true Option Device /dev/psaux #alt. protocols: event alps Option Protocol auto-dev Option HorizScrollDelta 0 Option SHMConfig on Option LeftEdge 120 Option RightEdge 950 Option TopEdge 120 Option BottomEdge 650 Option FingerLow 14 Option FingerHigh 15 Option MaxTapTime 0 Option TappingOff 1 Option MaxTapMove 110 Option EmulateMidButtonTime 75 Option VertScrollDelta 20 Option CornerCoasting 1
Bug#506221: xserver-xorg-video-intel: server crash
Package: xserver-xorg-video-intel Version: 2:2.4.2-1 Severity: normal Hi, I left the screen locked and blanked, and when I came back I got a message from GDM that the X server has crashed and it had failed to be restarted. Below is the log from the cras server and some kernel logs that seem to be related. Xorg.0.log.old -- X.Org X Server 1.5.3 Release Date: 5 November 2008 X Protocol Version 11, Revision 0 Build Operating System: Linux 2.6.26-1-686 i686 Debian Current Operating System: Linux boogie 2.6.27.6 #7 SMP Fri Nov 14 11:04:37 CET 2008 x86_64 Build Date: 11 November 2008 11:19:34PM xorg-server 2:1.5.3-1 ([EMAIL PROTECTED]) Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. (==) Log file: /var/log/Xorg.0.log, Time: Wed Nov 19 14:24:15 2008 (==) Using config file: /etc/X11/xorg.conf (==) ServerLayout Default Layout (**) |--Screen Default Screen (0) (**) | |--Monitor Dell 2007WFP (**) | |--Device Intel 82G33/G31 (**) |--Input Device PS/2 Keyboard (**) |--Input Device Logitech Wireless Mouse (**) Option AIGLX true (**) Option AllowEmptyInput true (==) Automatically adding devices (==) Automatically enabling devices (WW) The directory /usr/share/fonts/X11/cyrillic does not exist. Entry deleted from font path. (WW) The directory /usr/share/fonts/X11/75dpi/ does not exist. Entry deleted from font path. (WW) The directory /usr/share/fonts/X11/75dpi does not exist. Entry deleted from font path. (==) FontPath set to: /usr/share/fonts/X11/misc, /usr/share/fonts/X11/100dpi/:unscaled, /usr/share/fonts/X11/Type1, /usr/share/fonts/X11/100dpi, /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType (==) ModulePath set to /usr/lib/xorg/modules (**) Extension Composite is enabled (II) Open ACPI successful (/var/run/acpid.socket) (II) Loader magic: 0x81d12e0 (II) Module ABI versions: X.Org ANSI C Emulation: 0.4 X.Org Video Driver: 4.1 X.Org XInput driver : 2.1 X.Org Server Extension : 1.1 X.Org Font Renderer : 0.6 (II) Loader running on linux (++) using VT number 24 (--) PCI:*([EMAIL PROTECTED]:2:0) Intel Corporation 82G33/G31 Express Integrated Graphics Controller rev 2, Mem @ 0xff90/0, 0xd000/0, 0xff60/0, I/O @ 0xf140/0 (II) System resource ranges: [0] -1 0 0x - 0x (0x1) MX[B] [1] -1 0 0x000f - 0x000f (0x1) MX[B] [2] -1 0 0x000c - 0x000e (0x3) MX[B] [3] -1 0 0x - 0x0009 (0xa) MX[B] [4] -1 0 0x - 0x (0x1) IX[B] [5] -1 0 0x - 0x (0x1) IX[B] (II) extmod will be loaded. This was enabled by default and also specified in the config file. (II) dbe will be loaded. This was enabled by default and also specified in the config file. (II) glx will be loaded. This was enabled by default and also specified in the config file. (II) freetype will be loaded. This was enabled by default and also specified in the config file. (II) record will be loaded by default. (II) dri will be loaded. This was enabled by default and also specified in the config file. (II) LoadModule: dbe (II) Loading /usr/lib/xorg/modules/extensions//libdbe.so (II) Module dbe: vendor=X.Org Foundation compiled for 1.5.3, module version = 1.0.0 Module class: X.Org Server Extension ABI class: X.Org Server Extension, version 1.1 (II) Loading extension DOUBLE-BUFFER (II) LoadModule: ddc (II) Module ddc already built-in (II) LoadModule: dri (II) Loading /usr/lib/xorg/modules/extensions//libdri.so (II) Module dri: vendor=X.Org Foundation compiled for 1.5.3, module version = 1.0.0 ABI class: X.Org Server Extension, version 1.1 (II) Loading extension XFree86-DRI (II) LoadModule: extmod (II) Loading /usr/lib/xorg/modules/extensions//libextmod.so (II) Module extmod: vendor=X.Org Foundation compiled for 1.5.3, module version = 1.0.0 Module class: X.Org Server Extension ABI class: X.Org Server Extension, version 1.1 (II) Loading extension SHAPE (II) Loading extension MIT-SUNDRY-NONSTANDARD (II) Loading extension BIG-REQUESTS (II) Loading extension SYNC (II) Loading extension MIT-SCREEN-SAVER (II) Loading extension XC-MISC (II) Loading extension XFree86-VidModeExtension (II) Loading extension XFree86-Misc (II) Loading extension XFree86-DGA (II) Loading extension DPMS (II) Loading extension TOG-CUP (II) Loading extension Extended-Visual-Information (II) Loading extension XVideo (II) Loading extension XVideo-MotionCompensation (II) Loading extension X-Resource (II) LoadModule: freetype (II) Loading
Bug#506221: Acknowledgement (xserver-xorg-video-intel: server crash)
Hi,
The kernel logs in the original report were from the wrong boot, these
are the ones corresponding to the crash:
Nov 19 14:07:49 boogie kernel: [ 207.154936] [drm] Initialized drm 1.1.0
20060810
Nov 19 14:07:50 boogie kernel: [ 207.237253] pci :00:02.0: PCI INT A -
GSI 16 (level, low) - IRQ 16
Nov 19 14:07:50 boogie kernel: [ 207.237267] pci :00:02.0: setting latency
timer to 64
Nov 19 14:07:50 boogie kernel: [ 207.237448] [drm] Initialized i915 1.6.0
20060119 on minor 0
Nov 19 14:07:52 boogie kernel: [ 210.402737] set status page addr 0x00033000
Nov 19 14:07:53 boogie kernel: [ 211.261957] Xorg:3874 conflicting memory
types d000-e000 write-combining-uncached-minus
Nov 19 14:07:53 boogie kernel: [ 211.261976] reserve_memtype failed
0xd000-0xe000, track write-combining, req write-combining
Nov 19 14:07:56 boogie kernel: [ 214.297070] Xorg:3874 freeing invalid memtype
d000-e000
Nov 19 14:08:00 boogie kernel: [ 218.376895] ioctl32(Xorg:4560): Unknown cmd
fd(0) cmd(40086408){t:'d';sz:8} arg(ffee7da8) on /var/log/Xorg.0.log
Nov 19 14:08:00 boogie kernel: [ 218.413101] ioctl32(Xorg:4560): Unknown cmd
fd(0) cmd(40086408){t:'d';sz:8} arg(ffee7ee8) on /var/log/Xorg.0.log
Nov 19 14:08:01 boogie kernel: [ 219.700675] set status page addr 0x00033000
Nov 19 14:08:01 boogie kernel: [ 219.740887] Xorg:4560 conflicting memory
types d000-e000 write-combining-uncached-minus
Nov 19 14:08:01 boogie kernel: [ 219.740905] reserve_memtype failed
0xd000-0xe000, track write-combining, req write-combining
Nov 19 14:08:02 boogie kernel: [ 220.026942] Xorg:4560 conflicting memory
types d000-e000 write-combining-uncached-minus
Nov 19 14:08:02 boogie kernel: [ 220.026960] reserve_memtype failed
0xd000-0xe000, track write-combining, req write-combining
Nov 19 14:08:02 boogie kernel: [ 220.030144] Xorg:4866 freeing invalid memtype
d000-e000
Nov 19 14:08:02 boogie kernel: [ 220.301936] Xorg:4560 conflicting memory
types d000-e000 write-combining-uncached-minus
Nov 19 14:08:02 boogie kernel: [ 220.301956] reserve_memtype failed
0xd000-0xe000, track write-combining, req write-combining
Nov 19 14:08:02 boogie kernel: [ 220.305298] Xorg:4910 freeing invalid memtype
d000-e000
Nov 19 14:08:02 boogie kernel: [ 220.393629] Xorg:4560 conflicting memory
types d000-e000 write-combining-uncached-minus
Nov 19 14:08:02 boogie kernel: [ 220.393648] reserve_memtype failed
0xd000-0xe000, track write-combining, req write-combining
Nov 19 14:08:02 boogie kernel: [ 220.396915] Xorg:4912 freeing invalid memtype
d000-e000
Nov 19 14:08:02 boogie kernel: [ 220.481725] Xorg:4560 conflicting memory
types d000-e000 write-combining-uncached-minus
Nov 19 14:08:02 boogie kernel: [ 220.481744] reserve_memtype failed
0xd000-0xe000, track write-combining, req write-combining
Nov 19 14:08:02 boogie kernel: [ 220.484706] Xorg:4914 freeing invalid memtype
d000-e000
Nov 19 14:11:53 boogie kernel: [ 451.715561] [drm:drm_update_drawable_info]
*ERROR* Failed to copy cliprects from userspace
Nov 19 14:11:56 boogie kernel: [ 454.732034] [drm:i915_wait_irq] *ERROR* EBUSY
-- rec: 2 emitted: 5
Nov 19 14:23:56 boogie kernel: [ 1174.660621] Xorg:4560 freeing invalid memtype
d000-e000
Nov 19 14:23:58 boogie kernel: [ 1176.460322] ioctl32(Xorg:6498): Unknown cmd
fd(0) cmd(40086408){t:'d';sz:8} arg(ff7fd6c8) on /var/log/Xorg.0.log
Nov 19 14:23:58 boogie kernel: [ 1176.496491] ioctl32(Xorg:6498): Unknown cmd
fd(0) cmd(40086408){t:'d';sz:8} arg(ff7fd808) on /var/log/Xorg.0.log
Nov 19 14:23:59 boogie kernel: [ 1177.571387] set status page addr 0x00033000
Nov 19 14:23:59 boogie kernel: [ 1177.615722] Xorg:6498 conflicting memory
types d000-e000 write-combining-uncached-minus
Nov 19 14:23:59 boogie kernel: [ 1177.615740] reserve_memtype failed
0xd000-0xe000, track write-combining, req write-combining
Nov 19 14:24:02 boogie kernel: [ 1180.076294] Xorg:6498 freeing invalid memtype
d000-e000
Nov 19 14:24:07 boogie kernel: [ 1185.262682] ioctl32(Xorg:6513): Unknown cmd
fd(0) cmd(40086408){t:'d';sz:8} arg(ff839708) on /var/log/Xorg.0.log
Nov 19 14:24:07 boogie kernel: [ 1185.298945] ioctl32(Xorg:6513): Unknown cmd
fd(0) cmd(40086408){t:'d';sz:8} arg(ff839848) on /var/log/Xorg.0.log
Nov 19 14:24:08 boogie kernel: [ 1186.290967] set status page addr 0x00033000
Nov 19 14:24:08 boogie kernel: [ 1186.329569] Xorg:6513 conflicting memory
types d000-e000 write-combining-uncached-minus
Nov 19 14:24:08 boogie kernel: [ 1186.329587] reserve_memtype failed
0xd000-0xe000, track write-combining, req write-combining
Nov 19 14:24:10 boogie kernel: [ 1188.773301] Xorg:6513 freeing invalid memtype
d000-e000
Nov 19 14:24:15 boogie kernel: [ 1193.347721] ioctl32(Xorg:6534): Unknown cmd
fd(0) cmd(40086408){t:'d';sz:8} arg(ffdbac88) on
xorg: Changes to 'debian-experimental'
debian/changelog |4
debian/control | 10 +-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 39443c583f5fc16c475a48138808224441104eec
Author: Julien Cristau [EMAIL PROTECTED]
Date: Wed Nov 19 19:27:52 2008 +0100
xserver-xorg Depends on hal.
diff --git a/debian/changelog b/debian/changelog
index 8fb1cd7..7666d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xorg (1:7.4~5) UNRELEASED; urgency=low
+ [ Loic Minier ]
* Also upgrade Driver i810 or via lines which have trailing comments.
* Shut up rmdir errors with 2/dev/null in all maintainer scripts when
trying to remove dirs; this might confuse debconf.
+ [ Julien Cristau ]
+ * xserver-xorg Depends on hal.
+
-- Loic Minier [EMAIL PROTECTED] Wed, 15 Oct 2008 21:52:39 +0200
xorg (1:7.4~4) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 9b14e37..d451698 100644
--- a/debian/control
+++ b/debian/control
@@ -85,6 +85,7 @@ Depends:
xserver-xorg-core (= 2:1.5),
xserver-xorg-video-all | xserver-xorg-video-4,
xserver-xorg-input-all | xserver-xorg-input-2.1,
+ hal,
${shlibs:Depends},
${misc:Depends},
xkb-data | xkb-data-legacy,
commit 7f940975117b8e876d4dcda9d7daeb824bdf8406
Author: Julien Cristau [EMAIL PROTECTED]
Date: Wed Nov 19 19:26:43 2008 +0100
Wrap Depends for xserver-xorg
diff --git a/debian/control b/debian/control
index 7a60dc2..9b14e37 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,14 @@ Package: xserver-xorg
Architecture: any
Conflicts: xserver-xfree86 ( 6.8.2.dfsg.1-1), xserver-common ( 7),
x11-common ( 1:7.3+11)
Replaces: xserver-common ( 7), x11-common ( 1:7.3+11)
-Depends: xserver-xorg-core (= 2:1.5), xserver-xorg-video-all |
xserver-xorg-video-4, xserver-xorg-input-all | xserver-xorg-input-2.1,
${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
+Depends:
+ xserver-xorg-core (= 2:1.5),
+ xserver-xorg-video-all | xserver-xorg-video-4,
+ xserver-xorg-input-all | xserver-xorg-input-2.1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ xkb-data | xkb-data-legacy,
+ x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xorg: Changes to 'ubuntu'
debian/changelog | 22 --
debian/control |3 +--
2 files changed, 17 insertions(+), 8 deletions(-)
New commits:
commit 362027fffaf78a5cb5bbb4c8b95f3587f71b2ff1
Author: Bryce Harrington [EMAIL PROTECTED]
Date: Wed Nov 19 10:38:43 2008 -0800
Adding dependency on hal
jcristau xserver-xorg should be a good candidate for the hal Depends
or Recommends.
diff --git a/debian/changelog b/debian/changelog
index 6c53d93..5adc73f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,21 @@
-xorg (1:7.4~5ubuntu3) intrepid; urgency=low
+xorg (1:7.4~5ubuntu4) jaunty; urgency=low
+
+ * Depend on hal. Otherwise, if launching X without hal installed you
+won't get any input devices.
- * debian/control: Depend on -evdev so it will get installed on upgrades.
-Otherwise, in certain upgrade scenarios this can result in
-non-functioning keyboard/mouse.
-(LP: #271138)
+ -- Bryce Harrington [EMAIL PROTECTED] Wed, 19 Nov 2008 10:26:14 -0800
- -- Bryce Harrington [EMAIL PROTECTED] Tue, 21 Oct 2008 16:10:01 -0700
+xorg (1:7.4~5ubuntu3) intrepid; urgency=low
+
+ * debian/control:
+- Depend on -evdev so it will get installed on upgrades.
+ Otherwise, in certain upgrade scenarios this can result in
+ non-functioning keyboard/mouse.
+ (LP: #271138)
+- Remove displayconfig-gtk from Suggests since it is no longer present
+ in the archive anyway
+
+ -- Bryce Harrington [EMAIL PROTECTED] Tue, 21 Oct 2008 16:16:10 -0700
xorg (1:7.4~5ubuntu2) intrepid; urgency=low
diff --git a/debian/control b/debian/control
index 537ea42..23db932 100644
--- a/debian/control
+++ b/debian/control
@@ -82,9 +82,8 @@ Package: xserver-xorg
Architecture: any
Conflicts: xserver-xfree86 ( 6.8.2.dfsg.1-1), xserver-common ( 7),
x11-common ( 1:7.3+11)
Replaces: xserver-common ( 7), x11-common ( 1:7.3+11)
-Depends: xserver-xorg-core (= 2:1.5), xserver-xorg-video-all |
xserver-xorg-video-4, xserver-xorg-input-all | xserver-xorg-input-2.1,
xserver-xorg-input-evdev, ${shlibs:Depends}, ${misc:Depends}, xkb-data |
xkb-data-legacy, x11-xkb-utils, mdetect
+Depends: xserver-xorg-core (= 2:1.5), xserver-xorg-video-all |
xserver-xorg-video-4, xserver-xorg-input-all | xserver-xorg-input-2.1,
xserver-xorg-input-evdev, ${shlibs:Depends}, ${misc:Depends}, xkb-data |
xkb-data-legacy, x11-xkb-utils, mdetect, hal
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
-Suggests: displayconfig-gtk
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
libdrm: Changes to 'upstream-experimental'
Rebased ref, commits from common ancestor:
commit 930c0e7cf4f4776f7a69e7acc6fedeed7addb235
Author: Eric Anholt [EMAIL PROTECTED]
Date: Fri Nov 7 12:58:52 2008 -0800
intel: Restart on interrupt of bo_wait_rendering instead of complaining.
diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
index 5eaf5f5..9cb3359 100644
--- a/libdrm/intel/intel_bufmgr_gem.c
+++ b/libdrm/intel/intel_bufmgr_gem.c
@@ -658,7 +658,9 @@ drm_intel_gem_bo_wait_rendering(drm_intel_bo *bo)
set_domain.handle = bo_gem-gem_handle;
set_domain.read_domains = I915_GEM_DOMAIN_GTT;
set_domain.write_domain = 0;
-ret = ioctl (bufmgr_gem-fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, set_domain);
+do {
+ ret = ioctl(bufmgr_gem-fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, set_domain);
+} while (ret == -1 errno == EINTR);
if (ret != 0) {
fprintf (stderr, %s:%d: Error setting memory domains %d (%08x %08x):
%s .\n,
__FILE__, __LINE__,
commit 87e90c73620b88005fcca5fd40d0b08932e1
Author: Pekka Paalanen [EMAIL PROTECTED]
Date: Sun Nov 2 13:48:32 2008 +0200
nouveau: compat fix for set_page_locked().
The set_page_locked() function has changed its name again.
2.6.28 offers __set_page_locked() instead, which uses non-atomic
__set_bit() to do the work. In this case, offer our own
set_page_locked() using the atomic set_bit(), because I do not know
if atomic access is really necessary. Atomic behaviour is the one
previously expected.
Signed-off-by: Pekka Paalanen [EMAIL PROTECTED]
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index e09be47..bc4d2e5 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -392,4 +392,17 @@ extern struct page *drm_vm_sg_nopage(struct vm_area_struct
*vma,
#endif
#endif
+#if (LINUX_VERSION_CODE KERNEL_VERSION(2,6,27))
+#define set_page_locked SetPageLocked
+#elif (LINUX_VERSION_CODE KERNEL_VERSION(2,6,27))
+/*
+ * The kernel provides __set_page_locked, which uses the non-atomic
+ * __set_bit function. Let's use the atomic set_bit just in case.
+ */
+static inline void set_page_locked(struct page *page)
+{
+ set_bit(PG_locked, page-flags);
+}
+#endif
+
#endif
diff --git a/linux-core/nouveau_sgdma.c b/linux-core/nouveau_sgdma.c
index 739e025..1163baf 100644
--- a/linux-core/nouveau_sgdma.c
+++ b/linux-core/nouveau_sgdma.c
@@ -227,11 +227,7 @@ nouveau_sgdma_init(struct drm_device *dev)
dev_priv-gart_info.sg_dummy_page =
alloc_page(GFP_KERNEL|__GFP_DMA32);
-#if (LINUX_VERSION_CODE = KERNEL_VERSION(2,6,27))
set_page_locked(dev_priv-gart_info.sg_dummy_page);
-#else
- SetPageLocked(dev_priv-gart_info.sg_dummy_page);
-#endif
dev_priv-gart_info.sg_dummy_bus =
pci_map_page(dev-pdev, dev_priv-gart_info.sg_dummy_page, 0,
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
commit 00847dabe0fa5ccf796658f486e8f6f7a77e043b
Author: Eric Anholt [EMAIL PROTECTED]
Date: Thu Oct 30 11:36:46 2008 -0700
libdrm 2.4.1.
diff --git a/configure.ac b/configure.ac
index 92507cb..0f7c79e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AC_PREREQ(2.57)
-AC_INIT([libdrm], 2.4.0, [EMAIL PROTECTED], libdrm)
+AC_INIT([libdrm], 2.4.1, [EMAIL PROTECTED], libdrm)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
commit 4b9826408f65976a1a13387beda748b65e03ec52
Author: Eric Anholt [EMAIL PROTECTED]
Date: Thu Oct 30 09:33:07 2008 -0700
intel: Rename dri_ and intel_ symbols to drm_intel_.
I wanted to avoid doing this, as it's a bunch of churn, but there was a
conflict between the dri_ symbols in libdrm and the symbols that were in
Mesa in 7.2, which broke Mesa 7.2 AIGLX when the 2D driver had loaded new
libdrm symbols. The new naming was recommended by cworth for giving the
code a unique prefix identifying where the code lives.
Additionally, take the opportunity to fix up two API mistakes: emit_reloc's
arguments were in a nonsensical order, and set_tiling lacked the stride
argument that the kernel will want to use soon. API compatibility with
released code is maintained using #defines.
diff --git a/libdrm/intel/intel_bufmgr.c b/libdrm/intel/intel_bufmgr.c
index 92b6046..188eac2 100644
--- a/libdrm/intel/intel_bufmgr.c
+++ b/libdrm/intel/intel_bufmgr.c
@@ -39,26 +39,26 @@
#include intel_bufmgr.h
#include intel_bufmgr_priv.h
-/** @file dri_bufmgr.c
+/** @file intel_bufmgr.c
*
* Convenience functions for buffer management methods.
*/
-dri_bo *
-dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size,
-unsigned int alignment)
+drm_intel_bo *
+drm_intel_bo_alloc(drm_intel_bufmgr *bufmgr, const char *name,
+ unsigned long size, unsigned int alignment)
{
return bufmgr-bo_alloc(bufmgr, name, size,
xorg: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 40026b4be0aa9676d8bb1bc26ac0860d7197fdbe Author: Timo Aaltonen [EMAIL PROTECTED] Date: Wed Nov 19 22:17:23 2008 +0200 Fix the changelog dc-gtk was dropped from the latest release, not the one before that. diff --git a/debian/changelog b/debian/changelog index 5adc73f..02a02d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ xorg (1:7.4~5ubuntu4) jaunty; urgency=low * Depend on hal. Otherwise, if launching X without hal installed you won't get any input devices. + * Remove displayconfig-gtk from Suggests since it is no longer present +in the archive anyway -- Bryce Harrington [EMAIL PROTECTED] Wed, 19 Nov 2008 10:26:14 -0800 @@ -12,8 +14,6 @@ xorg (1:7.4~5ubuntu3) intrepid; urgency=low Otherwise, in certain upgrade scenarios this can result in non-functioning keyboard/mouse. (LP: #271138) -- Remove displayconfig-gtk from Suggests since it is no longer present - in the archive anyway -- Bryce Harrington [EMAIL PROTECTED] Tue, 21 Oct 2008 16:16:10 -0700 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
