[01:25] New bug: #64428 in acpi-support (main) "Mouse cursor gone after hibernate/resume (dup-of: 63258)" [Undecided,Unconfirmed] https://launchpad.net/bugs/64428 [01:30] New bug: #64333 in acpi (main) "Mouse cursor disappears after suspend (dup-of: 63258)" [Undecided,Unconfirmed] https://launchpad.net/bugs/64333 [04:55] New bug: #55108 in xorg "radeon driver, INVALID IO ALLOCATION" [Undecided,Confirmed] https://launchpad.net/bugs/55108 === cjwatson [n=cjwatson@82-69-40-219.dsl.in-addr.zen.co.uk] has joined #ubuntu-x === kylem [i=kyle@fruit.freedesktop.org] has joined #ubuntu-x [08:19] ok, I'm now going to merge xorg [08:32] bah [08:32] we have 7.1.1, debian has 7.1.0 [08:33] does that matter? [08:33] not really [08:34] but I bet there will be someone who demands it to be 7.2* ;) [08:34] you haven't done one for 7.2 yet? [08:35] no [08:37] debdiff is 3.5MB, yikes [08:37] because of the translations, mostly [08:37] yay, fun :) [08:37] oh, ok [08:37] less fun, then ;) [08:37] don't hold your breath ;) [08:37] sigh [08:39] I guess the new one can be called 7.2-0ubuntu1 [08:39] yeah [08:41] latest merge was with 7.0.22, 18 revisions after that [08:59] ok, diff is only 190kB [08:59] without po [09:00] a lot better then [09:01] yep [09:05] nice to have Depends/Conflicts etc in multiple lines.. a lot easier to actually find what has changed [09:05] not that the current one in Ubuntu has so... [09:05] gr [09:05] yeah I changed that for the x11-common conflicts recently [09:06] that line was really too fucking long [09:06] that's one massive list :) [09:44] ok, maybe best to keep the metapackages for now (xlibs-dev, xbase-clients, xutils), not touching those [09:45] later we can drop at least xutils and sync it from Debian [09:45] since there are some bugs open about missing xon [09:49] * debian/local/Xsession: set temporary umask when creating $ERRFILE. [09:49] -if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [09:49] +if touch "$ERRFILE" 2> /dev/null && [ -w "$ERRFILE" ] && [09:49] old version is from ubuntu [09:51] jcristau: I'll put a diff available when I'm ready, so you can see if some of the changes (like above) is something Debian might want too [09:51] cool, thanks [09:51] a security update too [09:51] "Fix race condition when chown'ing .xsession-errors." [09:52] CVE-2006-5214 [09:56] indeed [09:56] can you file a bug about that? [09:56] sure, when I'm done with this [09:56] thanks [09:59] eh, the ubuntu dexconf still uses /usr/share/X11/fonts/* [09:59] but Debian still has /usr/X11R6?-) [10:00] both that and /usr/share/fonts/X11/* [10:00] yeah, for partial upgrades [10:01] I guess we'll change that post-etch [10:01] ooh, preseeding support [10:01] me like [10:01] not that we use fontservers.. === seb128 [n=seb128@ubuntu/member/seb128] has joined #ubuntu-x [10:03] hi seb128 [10:03] Hi tepsipakki [10:03] I'm doing xorg now, but it'll take a while [10:04] lots of funky stuff in it [10:05] k, I've been busy with other things yesterday, I'll have a look to your libx11 merge if nobody else is on it yet [10:06] cool [10:14] no mention on the changelog as to why dexconf has entries for wacom [10:14] not in Debian [10:17] tepsipakki: actually no need to file a bug for the Xsession umask stuff, I just committed the fix [10:18] heh === mvo [n=egon@p54A64909.dip.t-dialin.net] has joined #ubuntu-x [10:53] I'll add 2560x1600 to DEFAULT_DCRESOLUTIONS :) [10:53] I have such a beast [11:22] heh, nice typo on vars.i386 [11:22] SERVER_XORG_DETECT_DEPENDS="laptop-detect, xresprobe, mdetect, discover1, dmidecode" [11:22] missing X [11:25] jcristau: vars.amd64 lacks xserver-xorg-video-vmware for XSERVER_XORG_VIDEO_DEPENDS [11:27] I'm not sure if the bug is in vars.amd64 or all the others ;) [11:30] * Readd xserver-xorg-driver-vmware to vars.amd64 and remove it from non x86* arches. (Closes Ubuntu: #38070) [11:31] so yes [11:32] hmm [11:32] it's both, then :) [11:32] right :) [11:45] 3000 lines of diff to go === mvo_ [n=egon@p54A66565.dip.t-dialin.net] has joined #ubuntu-x [12:02] -[ -f /etc/default/rcS ] && . /etc/default/rcS [12:02] +. /etc/default/rcS [12:02] * debian/x11-common.init: Only source /etc/default/rcS if it exists, allowing x11-common to be installed by debootstrap. [12:02] jcristau: you might want that [12:03] yeah, possibly [12:03] (although I don't think debootstrap ever installs x11-common in debian) [12:08] not yet :-) [12:08] we did that because we were switching to console-setup [12:08] which needs xkb-data, which needs x11-common - if Debian ever makes that switch, then you'll need the same thing [12:08] cjwatson: ok, thanks [12:14] oh joy, next up: xserver-xorg.config.in [12:15] hmm, Debian doesn't have one :) [12:15] wondered why it looked strange [12:15] ah, it's in postinst [12:16] * Incorporate the entire old xserver-xorg.config script in to the [12:16] postinst script. This is hideously dirty, but it should allow the script [12:16] to properly expect discover and xresprobe to be installed without having [12:16] gross hacks in tasksel just for this task. We'll junk all this for etch+1. [12:16] Thanks to Joey Hess for the solution. [12:16] cjwatson: so, should we dump the old one and go with Debian? [12:18] we'd need to merge our changes to xserver-xorg.config.in into Debian's postinst [12:18] sure [12:18] but yes, we should follow that change, imo [12:18] 'cos then I can remove *our* gross hacks in tasksel [12:19] Ok, I'll do that after lunch.. my fingers are freezing which means that they scream for energy ;) [12:19] bbl -> [12:19] cjwatson: joeyh really pushed for that change :) [12:21] don't blame him [12:21] s/^/I / [12:35] New bug: #4229 in totem (main) "Totem receives BadAlloc when playing very large movies using Xv (dup-of: 35229)" [Medium,Confirmed] https://launchpad.net/bugs/4229 === Hobbsee [n=Hobbsee@ubuntu/member/hobbsee] has joined #ubuntu-x [01:01] tepsipakki: good point. [01:01] hah [01:01] welcome [01:02] :) [01:03] :) === Hobbsee doenst know much about X, but likes lurkign. except that hardlocking is bad, of course [01:35] New bug: #33753 in gnome-screensaver "don't use OpenGL savers if no hardware support" [Medium,Confirmed] https://launchpad.net/bugs/33753 [01:36] tepsipakki: ping? [01:38] pong [01:38] tepsipakki: libxcb is dep waiting on libpthread-stubs0-dev and required for libx11 [01:38] looking at it [01:38] still? [01:39] ok === givr1 [n=Florent@APuteaux-152-1-56-125.w82-120.abo.wanadoo.fr] has joined #ubuntu-x === givr1 [n=Florent@APuteaux-152-1-56-125.w82-120.abo.wanadoo.fr] has left #ubuntu-x [] [02:06] - db_get debian-installer/language || debug_report_status "db_get debian-installer/language" [02:06] - REALLANG=${RET%%:*} [02:06] - REALLANG=${REALLANG%%@*} [02:06] + REALLANG=${LANG%%@*} [02:06] hmm [02:10] not sure what stripping :* achieved [02:10] REALLANG=${REALLANG%%.*} came after that [02:10] that makes more sense [02:11] but the db_get -stuff.. do I leave it or not [02:12] I'll leave it for now [02:13] using LANG should be OK I think [02:13] ok, cleaner that way [02:13] tepsipakki: you are doing a merge from the base version of the merge to Debian's version, not just looking at the diff between Ubuntu and Debian, right? [02:13] i.e. a proper three-way merge [02:15] no.. diffing latest ubuntu vs latest debian [02:15] grab-merge doesn't work [02:15] since xorg isn't in mergers.u.c [02:16] where is this debian-installer/language stuff? I don't see it in git [02:16] argh [02:16] you must do a three-way merge [02:16] use snapshot.debian.net [02:16] (to get the base version) [02:16] you can't merge packages sanely without a three-way merge [02:17] it's far too easy to lose stuff by mistake [02:17] oh, it's only in ubuntu [02:17] alright, looking [02:21] debdiff 7.0.22 - 7.1.1ubuntu8 is a measly 65kB :) === mvo [n=egon@p54A66565.dip.t-dialin.net] has joined #ubuntu-x === seb128 [n=seb128@ubuntu/member/seb128] has joined #ubuntu-x [03:14] tepsipakki: not good, after xcb installation and libx11 upgrade my gnome-session crashes directly [03:14] gnome-session: xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed. [03:15] seb128: there are patches in a few other X libs, did you upgrade them? [03:15] jcristau: I'm uptodate with feisty [03:15] hmm [03:15] might be that something didn't get synced or didn't build yet [03:15] can you get a backtrace? [03:15] in which case the libx11 Depends needs to enforce the update [03:16] #1 0xb7661df0 in raise () from /lib/tls/i686/cmov/libc.so.6 [03:16] #2 0xb7663641 in abort () from /lib/tls/i686/cmov/libc.so.6 [03:16] #3 0xb765b43b in __assert_fail () from /lib/tls/i686/cmov/libc.so.6 [03:16] #4 0xb71d4651 in xcb_xlib_unlock () from /usr/lib/libxcb-xlib.so.0 [03:16] #5 0xb79c9bd4 in _XCBUnlockDisplay (dpy=0x8076140) at ../../src/xcb_lock.c:34 [03:16] #6 0xb7ab1601 in XRRQueryVersion () from /usr/lib/libXrandr.so.2 [03:16] #7 0xb7ab1762 in XRRSetScreenConfigAndRate () from /usr/lib/libXrandr.so.2 [03:16] let me install debug packages for it [03:16] ok, that's strange [03:16] oh [03:16] probably a bug in libxrandr then [03:16] my GNOME session set an another resolution than the xorg one with xrandr [03:16] yep [03:17] unlockdisplay without holding the lock [03:17] weird that it's triggered after the libxcb installation or the libx11 upgrade though [03:17] let me downgrade libx11 [03:17] looks like #400441 [03:19] indeed [03:20] ii libxrandr2 1.1.1-0ubuntu1 X11 RandR extension library [03:21] http://lists.debian.org/debian-devel-announce/2006/11/msg00010.html [03:21] "Both of these represent bugs in a caller of libX11, and *not* in libX11 [03:21] or libxcb." [03:23] I blame libxrandr [03:23] let's see if 1.1.1 has the pointed patch [03:25] bah [03:25] libxrandr 1.1.1 doesn't have the patch [03:27] tepsipakki: any reason we can't update libxrandr to 1.2.0 now? [03:27] jcristau: ^^ :) [03:27] Debian has it [03:28] was it just released [03:28] yes, yesterday or so [03:28] oh, that old [03:28] it needs x11proto 1.2 [03:28] err [03:28] x11proto-randr 1.2 [03:29] maybe it won't break anything [03:29] x11proto-randr | 1.2.0-1 | http://archive.ubuntu.com feisty/main Sources [03:29] grumpf [03:29] 99_configure [03:29] Applying patches...failed! (check stampdir/log/patch for details) [03:29] I hate that quilt patch [03:29] s/patch/bug [03:29] when there is no patch it tries to apply a 99_configure for whatever reason [03:30] sih [03:30] mkdir debian/patches fixes it [03:30] build new libxrandr [03:30] tepsipakki: by the way the server needs a patch in randr/randr.c [03:30] or run debian/rules prepare? [03:30] jcristau: same as the damage patch? [03:31] yeah s/RANDR_MAJOR/1/;s/RANDR_MINOR/1/ [03:31] ok [03:31] new libxrandr fixes gnome-session for me [03:31] anybody has an objection with syncing 1.2.0 from Debian now? [03:31] libxrandr from experimental is buggy [03:31] I forgot to bump the shlibs [03:31] ah :/ [03:31] :/ [03:31] ah, only that [03:32] yeah [03:32] I can fix that ;) [03:32] as far as I know :) [03:32] should be safe to update before libx11, mesa, server, etc? [03:32] it's fixed in git, I guess I could just upload it [03:32] would be nice [03:32] that way we could just sync it [03:33] I have crappy uplink, but let's try it [03:33] libxrandr is quite small [03:33] especially if you don't have to upload the orig [03:34] brb, restarting a proper GNOME session === seb128 [n=seb128@ubuntu/member/seb128] has joined #ubuntu-x [03:48] seb128: you can get http://incoming.debian.org/libxrandr_1.2.0-3_i386.changes [03:48] should be fine now [03:48] jcristau: nice, thank you! [04:08] libxrandr sync done [04:21] finally.. xorg close to being ready === mvo_ [n=egon@p54A66565.dip.t-dialin.net] has joined #ubuntu-x [04:26] cjwatson: actually, it was a lot easier to merge that way.. [04:27] since there wasn't a lot of upstream changes to distract you [04:27] yeah, it can often be that way [04:40] I should probably keep the changelog as well [04:42] easy [05:03] ok, xorg is now in http://users.tkk.fi/~tjaalton/xorg/new [05:03] and also on my repository [05:03] tested it and it installed fine, but I guess it should [05:04] 've updated the xorg.conf font-paths [05:04] which it didn't do [05:24] ah [05:24] if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le "1:7.0.14"; then [05:24] we might want to bump that [05:25] but sadly, I need to go now.. [05:27] xorg took longer than expected [06:31] New bug: #20283 in xserver-xorg-video-ati "[fgl v5000] really bad sync" [Medium,Needs info] https://launchpad.net/bugs/20283 [06:32] tepsipakki: libpthread-stubs has been accepted which should make libxcb build [06:56] New bug: #27466 in xserver-xorg-video-ati "[radeon] can't do dual-link tmds, or second tmds transmitter" [Medium,Confirmed] https://launchpad.net/bugs/27466 [07:19] seb128: phew, progress :) [07:20] tepsipakki: I think libx11 will be ready to go tomorrow morning [07:20] I don't want to upload before stopping working today [07:27] thats fine [07:28] I packaged a new xorg-server which has a patch that makes it use randr protocol 1.1 [07:30] tepsipakki: why? [07:30] tepsipakki: we have xrandr 1.2.0 now [07:30] seb128: xserver 1.2 doesn't speak randr 1.2 [07:30] but xserver doesn't support that :) [07:30] 1.3 will [07:31] I took the damage-patch approach [07:31] ah, ok [07:31] we don't seem to have an operator on this channel [07:31] do we need one? [07:31] ah, to set topic? [07:31] the url to my repo could be on topic [07:31] yes [07:32] the channel doesn't seem to be +t? [07:57] New bug: #85811 in xorg (main) "[Feisty-Herd4-alternate-amd64] Cannot change screen resolution at installation time" [Undecided,Confirmed] https://launchpad.net/bugs/85811 [09:17] tepsipakki, jcristau: can mesa be updated before libx11? [09:17] yes [09:17] ok [09:17] compiz just crash now [09:17] heh :) [09:17] #3 0xb7cb343b in __assert_fail () from /lib/tls/i686/cmov/libc.so.6 [09:17] #4 0xb7c5f651 in xcb_xlib_unlock () from /usr/lib/libxcb-xlib.so.0 [09:17] #5 0xb7eabbd4 in _XCBUnlockDisplay (dpy=0x8075388) at ../../src/xcb_lock.c:34 [09:17] #6 0xb7e13475 in __glXInitialize () from /usr/lib/libGL.so.1 [09:17] I think that's the same lock problem than libxrandr [09:18] just for libgl [09:18] hmm, I'll have a look at mesa 6.5.2 [09:24] seb128: that's probably fixed in 6.5.2, there are a number of fixes that seem related [09:24] good [09:24] that's next on the updates list then ;) [09:28] maybe https://bugs.freedesktop.org/show_bug.cgi?id=8521 [09:28] Freedesktop bug 8521 in GLX "AllocAndFetchScreenConfigs unlocks twice" [Normal,Resolved: fixed] [09:34] I wonder if xlib/xcb should conflict with previous versions of libs that have known locking bugs [09:36] probably yep [09:37] because otherwise it just breaks lot of things for people doing partial upgrades [09:37] like the libxrandr bug broke gnome-session on my desktop === mvo [n=egon@p54A66565.dip.t-dialin.net] has joined #ubuntu-x [09:48] or is that a use case for Breaks? [09:48] it's an usecase for Breaks [09:48] but is Debian use Breaks yet? [09:48] almost every use of Conflicts << is a use case for Breaks ;-) [09:48] indeed, Breaks can't be deployed in Debian yet AFAIK [09:49] talk to iwj ... [10:12] New bug: #86550 in xorg (main) "Video card no longer supported by Ubuntu" [Undecided,Needs info] https://launchpad.net/bugs/86550 [10:21] New bug: #86301 in xorg (main) "Feature Request: Dynamic head configuration in X.org" [Undecided,Unconfirmed] https://launchpad.net/bugs/86301 [10:46] New bug: #85451 in Ubuntu "Switch tty, shutdown, reboot cause colorful screen with Nvidia proprietary driver (dup-of: 63558)" [Undecided,Needs info] https://launchpad.net/bugs/85451 [10:52] jcristau: so, xserver 1.3 will be mostly a bugfix-release, and not targeted for 7.3? [10:52] reading http://wiki.x.org/wiki/XDC2007Notes [10:52] err [10:53] updates to the protocols yes.. can't blame that being just bugfixing :) [10:53] maybe if you count output-hotplug (randr 1.2) as bugfixing [10:53] :) [10:54] I think keithp wants to release 1.3 next week or so [10:56] so I've heard too [10:58] tepsipakki: did you work on the mesa update yet? [10:58] seb128: it's in the same place as the rest [10:58] ok [10:58] can it be uploaded next? [10:59] http://users.tkk.fi/~tjaalton/xorg72/new [10:59] hell, why not :) [10:59] just making sure if you consider it ready before looking at it [11:00] well, the changelog seems funny [11:00] need to fix it [11:00] looks fine to me [11:01] the one in diff.gz isn't ;) [11:01] I'll do mesa next tomorrow morning if nobody has an objection [11:01] I looked at the .changes for the moment :p [11:01] mesa needs to go before libx11 [11:01] that sounds ok for me [11:01] oh it does? [11:01] did you read what I wrote like an hour ago? [11:01] ah, you mean the libxcb breakage? [11:02] right [11:02] it's not libxcb which is broken though [11:02] right [11:02] it's other packages [11:02] and the mesa bug makes compiz crash after libx11 update [11:03] so better to get the mesa update done first [11:03] yep [11:04] ok, anyway enough work for today, I'll build mesa locally, install it and we will see for the upload tomorrow morning if it doesn't break half of my desktop ;) [11:04] you can delete the ubuntu0.1 part of the changelog while you're at it :) [11:05] ok [11:05] did you build it? [11:05] yes, it [11:05] damn [11:05] it refuses to build due Maintainer not changer [11:05] changed [11:06] just wondering :p [11:06] oh [11:06] well maybe it was with older tools [11:06] a week ago or something [11:06] ok, building now [11:06] it takes ~1h with my laptop [11:06] we will see how it works [11:07] so didn't bother building it too often [11:07] I'll tell you that tomorrow morning [11:07] right [11:07] sure, g'night [11:07] 'night