Bug#561979: Reassign an imagemagick to X
Imagemagick seems to suffer from an X problem, therefore assign this bug to you. I might have missed it, but I see no evidence of an X bug? By elimination: - does not arrise in my machine whith the image http://www.fmwconcepts.com/misc_tests/logo2t.png - it arrise only with image with an alpha channel - only when running icewm or fluxbox but not running kde and gnome - only on linux and macosx The interection of all this fact point to X. But we are clueless to help. How can we debug this kind of problem ? I suppose I could wait after freeze. Bastien -- 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/aanlkti=hje8rfe+ziiea=o7uksgrmvjx2q0lyh5h-...@mail.gmail.com
Bug#561979: Reassign an imagemagick to X
Hello Bastien, On Wed, Dec 01, 2010 at 10:33:12AM +0100, roucaries bastien wrote: Imagemagick seems to suffer from an X problem, therefore assign this bug to you. I might have missed it, but I see no evidence of an X bug? By elimination: - does not arrise in my machine whith the image http://www.fmwconcepts.com/misc_tests/logo2t.png - it arrise only with image with an alpha channel - only when running icewm or fluxbox but not running kde and gnome - only on linux and macosx The interection of all this fact point to X. But we are clueless to help. How can we debug this kind of problem ? I suppose I could wait after freeze. Bastien As I'm running fluxbox, I tried it. None of the 3 following images found on the bugreport did crash my X: * logo2t.png * fuzzy-magick.png * yast.png For your information I'm running sid on AMD64. With latest xorg packages and imagemagick version 8:6.6.0.4-3. So as the original report is one year old, I would suggest testing again with recent version of both Xorg and imagemagick. Hope this helps, Julien VdG -- Julien Viard de Galbertjul...@vdg.blogsite.org http://silicone.homelinux.org/ jul...@silicone.homelinux.org GPG Key ID: D00E52B6 Published on: hkp://keys.gnupg.net Key Fingerprint: E312 A31D BEC3 74CC C49E 6D69 8B30 6538 D00E 52B6 signature.asc Description: Digital signature
xorg-server: Changes to 'ubuntu'
debian/patches/104_nvidia_autodetect.patch | 41 --
debian/patches/105_fglrx_autodetect.patch| 21 -
debian/patches/105_nvidia_fglrx_autodetect.patch | 86 +++
debian/patches/series|3
4 files changed, 87 insertions(+), 64 deletions(-)
New commits:
commit a06d0a60a91b7eb2e6915a8721349106f5ed0e07
Author: Robert Hooker robert.hoo...@canonical.com
Date: Wed Dec 1 10:45:03 2010 -0500
Drop old nvidia/fglrx autodetection patches, replace with a working one
that combines both.
diff --git a/debian/patches/104_nvidia_autodetect.patch
b/debian/patches/104_nvidia_autodetect.patch
deleted file mode 100644
index ac3383b..000
--- a/debian/patches/104_nvidia_autodetect.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
-index 19c06c8..e40551e 100644
a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -181,7 +181,34 @@ videoPtrToDriverList(struct pci_device *dev,
- case 0x102b:driverList[0] = mga; break;
- case 0x10c8:driverList[0] = neomagic; break;
- case 0x105d:driverList[0] = i128; break;
-- case 0x10de: case 0x12d2: driverList[0] = nv; break;
-+ case 0x10de: case 0x12d2:
-+ switch (dev-device_id) {
-+ /* NV1 */
-+ case 0x0008:
-+ case 0x0009:
-+ driverList[0] = vesa;
-+ break;
-+ /* NV3 */
-+ case 0x0018:
-+ case 0x0019:
-+ driverList[0] = nv;
-+ break;
-+ default:
-+ switch (dev-device_id 0xfff0) {
-+ /* Non-functional with both nouveau and nv */
-+ case 0x0840:
-+ case 0x0860:
-+ driverList[0] = nvidia;
-+ driverList[1] = vesa;
-+ break;
-+ default:
-+ driverList[0] = nvidia;
-+ driverList[1] = nouveau;
-+ driverList[2] = nv;
-+ break;
-+ }
-+ break;
-+ }
- case 0x1163:driverList[0] = rendition; break;
- case 0x5333:
- switch (dev-device_id)
-
diff --git a/debian/patches/105_fglrx_autodetect.patch
b/debian/patches/105_fglrx_autodetect.patch
deleted file mode 100644
index 74e93e3..000
--- a/debian/patches/105_fglrx_autodetect.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Binary files patched/.git/index and working/.git/index differ
-diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c
working/hw/xfree86/common/xf86AutoConfig.c
patched/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:11:52.0
-0700
-+++ working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 16:16:59.0
-0700
-@@ -165,7 +165,15 @@ videoPtrToDriverList(struct pci_device *
- case 0x1142:driverList[0] = apm; break;
- case 0xedd8:driverList[0] = ark; break;
- case 0x1a03:driverList[0] = ast; break;
-- case 0x1002:driverList[0] = ati; break;
-+ case 0x1002:
-+/* Technical fglrx works only on 0x791e and newer, but
-+ if the user has it installed, -ati and -radeonhd
-+ probably won't work anyway so we may as well try it
-+ in case it randomly does work. */
-+driverList[0] = fglrx; /* Supports R600 and newer only */
-+driverList[1] = radeonhd;
-+driverList[2] = ati;
-+break;
- case 0x102c:driverList[0] = chips; break;
- case 0x1013:driverList[0] = cirrus; break;
- case 0x8086:
diff --git a/debian/patches/105_nvidia_fglrx_autodetect.patch
b/debian/patches/105_nvidia_fglrx_autodetect.patch
new file mode 100644
index 000..b72ed0b
--- /dev/null
+++ b/debian/patches/105_nvidia_fglrx_autodetect.patch
@@ -0,0 +1,86 @@
+From 0366a844c36bf8424a2625425c181b9b97f35bee Mon Sep 17 00:00:00 2001
+From: Robert Hooker sarv...@ubuntu.com
+Date: Wed, 1 Sep 2010 13:23:21 -0400
+Subject: [PATCH] Attempt to get nvidia and fglrx working without an xorg.conf.
+
+Signed-off-by: Robert Hooker sarv...@ubuntu.com
+---
+ hw/xfree86/common/xf86AutoConfig.c | 12 +++-
+ hw/xfree86/common/xf86pciBus.c | 14 +-
+ 2 files changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
+index 8ef602d..a8f04b9 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
+@@ -81,6 +81,13 @@
+ \tDevice\t BUILTIN_DEVICE_NAME \n \
+ EndSection\n\n
+
++#define BUILTIN_SCREEN_SECTION_PROPRIETARY \
++ Section \Screen\\n \
++ \tIdentifier\t BUILTIN_SCREEN_NAME \n \
++ \tDevice\t BUILTIN_DEVICE_NAME \n \
++
Re: Ubuntu plans for Natty release
On Fre, 2010-11-26 at 18:58 +0100, Julien Cristau wrote: On Fri, Nov 26, 2010 at 08:44:29 +0100, Michel Dänzer wrote: I've thought of a simpler possible solution: * Fix the Gallium drivers to bail gracefully instead of crashing with UMS (this will need to happen anyway). * Ship the classic and Gallium drivers in separate directories and set the libGL search path such that the two directories will be tried one after another. Won't you also need to make the xserver's dri driver loader look for both drivers (for aiglx)? Good catch :) I forgot to mention AIGLX. It might be best to stick to the classic drivers for that for now, as they're probably more robust for that, and I don't think the additional functionality offered by the Gallium drivers can be used via indirect rendering anyway. -- Earthling Michel Dänzer |http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer -- 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/1291221472.1124.115.ca...@thor.local
xsf-docs: Changes to 'master'
New branch 'master' available with the following commits: commit 3fdfc1d41f3114aef6c9625c9fd9b21ec467cfe3 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 21:29:24 2010 +0100 Adjust titles. commit 435daeaac8cffddc1f153c15682dff8bf485ba04 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 21:25:05 2010 +0100 Adjust colours. commit 751107c30ae2ab6a47f8f1fa0edb7f7f194d4619 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 21:06:17 2010 +0100 Mention xserver-xorg-core-dbg as needed package. commit f109019104c3d42b523a6d050719f7cd2ba72e9b Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 20:58:49 2010 +0100 Re-order stuff in the CSS. commit 27047e3be4cae7b811daa1aabc9643f295f9aa23 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 20:32:56 2010 +0100 Use justified text. commit 172a983ed706f8dcb99d4df7506e0e1be0f6eaac Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 20:25:46 2010 +0100 Add report-bugs howto. commit 3b28a1ce7d4144b6ac5cb7057e96746fa7f521f2 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 20:24:39 2010 +0100 Include a background image. commit 8eb45306774b709eaa74b57b264328958411716d Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 18:29:58 2010 +0100 Add page breaks for the generated PDF files. But do not add a page break for the first h2; that's determined by the h1 then h2 sequence, which is written “h1 + h2” in CSS. commit 917e579f381117b63d4c93fc4d1b2ed9bd89fdcf Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 18:28:21 2010 +0100 Mention SIGPIPE and backtraces. commit 5000977d2708a472fcc6007fa7b2e0708a8353c1 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 18:02:04 2010 +0100 Restructure. commit 4155b8e393f1c1bb70e19c75b190ef76252c09fa Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 18:01:50 2010 +0100 Tweak the CSS. commit a76e1e0fc54ea02286be574328a668d1186c13f9 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 17:49:39 2010 +0100 More stuff about gdb. commit b2088e17278501bd7f1e309f5a3bdd19a2fa0766 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 17:19:53 2010 +0100 Use a tiny trick to use a CSS file. That makes it work for top-level and a depth of 1 directory. That should be sufficient for now, and doesn't require hardcoding a '/xsf.css' href. commit cc5f21652f8a8dde7a3726a43ce8816677903cd9 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 17:19:13 2010 +0100 Clean pdf files as well. commit 1314e9d6669c9df1ce24e274b30aefe884dc9461 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 17:18:49 2010 +0100 Clean stuff. commit 2255fa3ba574544e1e33a62486cbf3e2a6e1d7c6 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 17:18:33 2010 +0100 Generate PDF as well. commit f19bf3704f6e6c8cfd67cf19829eb1c3f823fdd6 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 16:16:25 2010 +0100 Add index. commit 80aa83960cee4eecb7883714f3792b80e24d7caa Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 15:44:33 2010 +0100 Add machinery. commit d439aec54894bbd94c8d2420b1dd5788cfb33fd2 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 15:12:17 2010 +0100 Initial commit. -- 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/e1pntbt-0007bv...@alioth.debian.org
xsf-tools: Changes to 'master'
mrconfig |1 + 1 file changed, 1 insertion(+) New commits: commit 7716e1b5066d5d1520c8340624d593b5a3a966e8 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 21:51:26 2010 +0100 Update repository list. diff --git a/mrconfig b/mrconfig index 8b48a2d..0f6b384 100644 --- a/mrconfig +++ b/mrconfig @@ -101,6 +101,7 @@ remoteaddupstream = [debian/doc-hackers.git] [debian/git-migration.git] [debian/xorg.git] +[debian/xsf-docs.git] [debian/xsf-tools.git] [doc/xorg-docs.git] [doc/xorg-sgml-doctools.git] -- 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/e1pnteu-0007tu...@alioth.debian.org
xsf-docs: Changes to 'master'
Makefile |9 ++--- index.mdwn | 10 +- 2 files changed, 15 insertions(+), 4 deletions(-) New commits: commit ccca5296481e7916057d5b2557a2d726dbeae5c5 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 22:06:18 2010 +0100 Document how we appreciate feedback. diff --git a/index.mdwn b/index.mdwn index 966d944..24e4f5d 100644 --- a/index.mdwn +++ b/index.mdwn @@ -4,3 +4,10 @@ * [How to report bugs](howtos/report-bugs.html) * [How to use GDB](howtos/use-gdb.html) + +## Feedback + + * Sources for those documents are available on + [git.debian.org](http://git.debian.org/?p=pkg-xorg/debian/xsf-docs.git). + * Patches, suggestions, flames, etc. are welcome, using the + [debian-x](http://lists.debian.org/debian-x/) mailing list. commit a29508790e4dbb7c97349d1c1bb636da47f21e48 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 21:59:59 2010 +0100 Add a link to report-bugs from the index. diff --git a/index.mdwn b/index.mdwn index bb676e7..966d944 100644 --- a/index.mdwn +++ b/index.mdwn @@ -2,4 +2,5 @@ ## Howtos -[How to use GDB](howtos/use-gdb.html) + * [How to report bugs](howtos/report-bugs.html) + * [How to use GDB](howtos/use-gdb.html) commit 4023140982f45230799133d0ded1193eff092c93 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 21:59:43 2010 +0100 Make it possible to build either html or pdf. diff --git a/Makefile b/Makefile index 347d9e4..3ab3881 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,11 @@ pdf_files = $(patsubst %.mdwn,%.pdf,$(mdwn_pages)) MDWN_TO_HTML = ./mdwn2html HTML_TO_PDF = wkhtmltopdf -all: $(html_pages) $(pdf_files) - @echo All done. +all: html pdf + +html: $(html_pages) + +pdf: $(pdf_files) %.html: %.mdwn $(MDWN_TO_HTML) $(MDWN_TO_HTML) $ $@ @@ -23,4 +26,4 @@ clean: rm -f $(html_pages) $(pdf_files) -.PHONY: clean +.PHONY: clean html pdf all -- 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/e1pntsn-0004hf...@alioth.debian.org
Bug#605621: keyboard no longer working in X
Package: upgrade-reports Severity: normal After upgrading from lenny to squeeze my keyboard stopped working in X (but worked with the console). It turned out that my /etc/X11/xorg.conf contained an invalid keyboard variant (nodeadkeys from a de keyboard I had a few years ago). X in lenny simply ignored the invalid variant (I guess, or was us/nodeadkeys valid in lenny?). This setting was put into /etc/default/keyboard during the upgrade, but X in squeeze silently fails with a wrong keyboard variant. See also bug 571636 for a similar problem. The real problem IMHO is that X silently fails for invalid keyboard layouts or variants (invalid in the sense that there is no keymap for that layout/variant, not that it does not match the real layout). Why can't X print an error message to the log file, and fall back to some default? Even if some keys result in different characters a wrong layout/variant is much better that a completely dead keyboard. Ironically, the nodeadkeys variant had exactly the opposite effect, it rendered *all* keys dead ;-) Joachim -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (950, 'testing'), (800, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash -- 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/20101201212348.7307.15107.report...@enterprise-e
Writing up some docs
Hi folks, I started a new repository, debian/xsf-docs.git, to hold some documentation. I picked the markdown (*.mdwn) language, since it's what I use in ikiwiki for blogging, and I didn't find major drawbacks until now. I wrote a tiny Makefile and a tiny shell wrapper to generate html, “make html” does that. It's also possible to generate pdf files, using the wbhtmltopdf tool (based on webkit), that's done using “make pdf”. “make” or “make all” run both. I've cloned it in pkg-xorg's htdocs on alioth, and set up a crontab: | PATH=/usr/bin:/bin | MAILTO= | XSF_DOCS=/home/groups/pkg-xorg/htdocs/xsf-docs | 0 * * * * cd $XSF_DOCS git pull --rebase make html (IOW: a refresh happens every hour.) That leads to: http://pkg-xorg.alioth.debian.org/xsf-docs/ I'll be trying to migrate appropriate stuff from the wiki to there, in an attempt to lower wiki entropy. Of course, you're welcome to contribute, either by pushing updates or by sending patches! I'm not sure it warrants its own source/binary package, but at any rate, it's probably a good idea to ship it to users, recommending whatever binary it's going to belong to from another package people are very likely to have installed. Mraw, KiBi. signature.asc Description: Digital signature
Re: Bug#605621: keyboard no longer working in X
On Wed, Dec 1, 2010 at 22:23:48 +0100, Joachim Reichel wrote: Package: upgrade-reports Severity: normal After upgrading from lenny to squeeze my keyboard stopped working in X (but worked with the console). It turned out that my /etc/X11/xorg.conf contained an invalid keyboard variant (nodeadkeys from a de keyboard I had a few years ago). X in lenny simply ignored the invalid variant (I guess, or was us/nodeadkeys valid in lenny?). This setting was put into /etc/default/keyboard during the upgrade, but X in squeeze silently fails with a wrong keyboard variant. See also bug 571636 for a similar problem. The real problem IMHO is that X silently fails for invalid keyboard layouts or variants (invalid in the sense that there is no keymap for that layout/variant, not that it does not match the real layout). Why can't X print an error message to the log file, and fall back to some default? Yeah that kind of sucks. Even if some keys result in different characters a wrong layout/variant is much better that a completely dead keyboard. Ironically, the nodeadkeys variant had exactly the opposite effect, it rendered *all* keys dead ;-) Care to include your xorg.conf, /etc/default/keyboard and Xorg log? Cheers, Julien signature.asc Description: Digital signature
xsf-docs: Changes to 'master'
COPYING | 19 +++ mdwn2html |1 + 2 files changed, 20 insertions(+) New commits: commit 0d56fca1617970c3d636b5a2647c3a8ce00ae670 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 22:42:17 2010 +0100 Specify content type through a meta tag. Apparently, iceweasel-4.0b7 is stupid enough to be unable to read the declared encoding in the XML header. Sigh. diff --git a/mdwn2html b/mdwn2html index d55c672..6d9d7e2 100755 --- a/mdwn2html +++ b/mdwn2html @@ -30,6 +30,7 @@ sed s#@@title@@#$title# $html EOF title@@title@@/title link rel=stylesheet type=text/css href=xsf.css / link rel=stylesheet type=text/css href=../xsf.css / +meta http-equiv=content-type content=application/xhtml+xml; charset=UTF-8 / /head body EOF commit cccaae01e00e762e36c7bd4cbc40d160156e3484 Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 22:36:25 2010 +0100 Add a COPYING file, with MIT/X licensing. diff --git a/COPYING b/COPYING new file mode 100644 index 000..2f50c7f --- /dev/null +++ b/COPYING @@ -0,0 +1,19 @@ +© 2010 Cyril Brulebois k...@debian.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the Software), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -- 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/e1pnuv3-0003gh...@alioth.debian.org
Bug#604974: WISHLIST: does not start without monitor connected
Hi Cyril: On Wed, Dec 01, 2010 at 01:38:50AM +0100, Cyril Brulebois wrote: Hi, Osvaldo La Rosa aldo.nos...@scarlet.be (30/11/2010): Hope this helps! sure, that seems to confirm that the underlying issue is the following: (EE) Screen(s) found, but none have a usable configuration. Could you please ask your friend to try with such contents for /etc/X11/xorg.conf? | Section Device | Identifier Card0 | Driver dummy | EndSection (with the xserver-xorg-video-dummy driver installed, and without any monitor connected). That seems to do the job here (even though I can't really disconnect my laptop's integrated screen). If that fails, please send the new xorg log. Sorry it doesn't work: - Gnome session starts okay, - Orca (screen reader) starts too - but he's NOT authorized to switch from Gnome to any console (ctrl+alt+f*) and that was the orig. problem he pointed me to submit a reportbug for. See 2 files in attach to complete this feedback. O. La Rosa. X.Org X Server 1.4.2 Release Date: 11 June 2008 X Protocol Version 11, Revision 0 Build Operating System: Linux Debian (xorg-server 2:1.4.2-10.lenny3) Current Operating System: Linux unknown0002448cdb3d 2.6.26-2-686 #1 SMP Thu Nov 25 01:53:57 UTC 2010 i686 Build Date: 25 September 2010 12:05:44PM Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. Module Loader present 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 Dec 1 18:26:15 2010 (==) Using config file: /etc/X11/xorg.conf (==) No Layout section. Using the first Screen section. (**) |--Screen Default Screen (0) (**) | |--Monitor Configured Monitor (==) No device specified for screen Default Screen. Using the first device section listed. (**) | |--Device Card0 (==) |--Input Device Configured Mouse (==) |--Input Device Generic Keyboard (==) The core pointer device wasn't specified explicitly in the layout. Using the first mouse device. (==) The core keyboard device wasn't specified explicitly in the layout. Using the first keyboard device. (==) Automatically adding devices (==) Automatically enabling devices (==) No FontPath specified. Using compiled-in default. (WW) The directory /usr/share/fonts/X11/cyrillic does not exist. Entry deleted from font path. (WW) The directory /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType 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/75dpi/:unscaled, /usr/share/fonts/X11/Type1, /usr/share/fonts/X11/100dpi, /usr/share/fonts/X11/75dpi (==) RgbPath set to /etc/X11/rgb (==) ModulePath set to /usr/lib/xorg/modules (II) Open ACPI successful (/var/run/acpid.socket) (II) Loader magic: 0x81e3800 (II) Module ABI versions: X.Org ANSI C Emulation: 0.3 X.Org Video Driver: 2.0 X.Org XInput driver : 2.0 X.Org Server Extension : 0.3 X.Org Font Renderer : 0.5 (II) Loader running on linux (II) LoadModule: pcidata (II) Loading /usr/lib/xorg/modules//libpcidata.so (II) Module pcidata: vendor=X.Org Foundation compiled for 1.4.2, module version = 1.0.0 ABI class: X.Org Video Driver, version 2.0 (++) using VT number 7 (II) PCI: PCI scan (all values are in hex) (II) PCI: 00:00:0: chip 8086,29c0 card 1043,82b0 rev 10 class 06,00,00 hdr 00 (II) PCI: 00:02:0: chip 8086,29c2 card 1043,82b0 rev 10 class 03,00,00 hdr 00 (II) PCI: 00:1b:0: chip 8086,27d8 card 1043,83b7 rev 01 class 04,03,00 hdr 00 (II) PCI: 00:1c:0: chip 8086,27d0 card , rev 01 class 06,04,00 hdr 81 (II) PCI: 00:1c:1: chip 8086,27d2 card , rev 01 class 06,04,00 hdr 81 (II) PCI: 00:1d:0: chip 8086,27c8 card 1043,8179 rev 01 class 0c,03,00 hdr 80 (II) PCI: 00:1d:1: chip 8086,27c9 card 1043,8179 rev 01 class 0c,03,00 hdr 00 (II) PCI: 00:1d:2: chip 8086,27ca card 1043,8179 rev 01 class 0c,03,00 hdr 00 (II) PCI: 00:1d:3: chip 8086,27cb card 1043,8179 rev 01 class 0c,03,00 hdr 00 (II) PCI: 00:1d:7: chip 8086,27cc card 1043,8179 rev 01 class 0c,03,20 hdr 00 (II) PCI: 00:1e:0: chip 8086,244e card , rev e1 class 06,04,01 hdr 01 (II) PCI: 00:1f:0: chip 8086,27b8 card 1043,8179 rev 01 class 06,01,00 hdr 80 (II) PCI: 00:1f:1: chip 8086,27df card 1043,8179 rev 01 class 01,01,8a hdr 00 (II) PCI: 00:1f:2: chip 8086,27c0 card 1043,8179 rev 01 class 01,01,8f hdr 00 (II) PCI: 00:1f:3: chip 8086,27da card 1043,8179 rev 01 class 0c,05,00 hdr 00 (II) PCI: 01:00:0: chip 1969,1026 card 1043,831c rev b0 class 02,00,00 hdr 00 (II) PCI: End of PCI scan (II) Intel Bridge workaround enabled (II) Host-to-PCI bridge: (II) Bus 0: bridge is at (0:0:0), (0,0,3), BCTRL: 0x0008 (VGA_EN
xorg-server: Changes to 'upstream-unstable'
hw/dmx/glxProxy/glxcmds.c|6 ++--
hw/dmx/glxProxy/glxcmdsswap.c|2 -
hw/kdrive/ephyr/ephyrdriext.c|2 -
hw/xfree86/dixmods/extmod/xf86dga2.c | 46 +--
hw/xfree86/modes/xf86RandR12.c | 10 +++
5 files changed, 38 insertions(+), 28 deletions(-)
New commits:
commit 6f7f3e2b799984e1b8aade89726dc226fc0b89ac
Author: Cyril Brulebois k...@debian.org
Date: Wed Dec 1 14:12:55 2010 +0100
Fix screen number checks.
screenInfo.numScreens is not a valid screen number, they go from 0 to
numScreens - 1.
Signed-off-by: Cyril Brulebois k...@debian.org
Reviewed-by: Alex Deucher alexdeuc...@gmail.com
Signed-off-by: Keith Packard kei...@keithp.com
(cherry picked from commit 279ef1ffd787dba2f0d5056849b9cb15d36aa3eb)
diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index 31fd431..d790b71 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@@ -1536,7 +1536,7 @@ int __glXGetVisualConfigs(__GLXclientState *cl, GLbyte
*pc)
int i, p;
screen = req-screen;
-if (screen screenInfo.numScreens) {
+if (screen = screenInfo.numScreens) {
/* The client library must send a valid screen number. */
client-errorValue = screen;
return BadValue;
@@ -2685,7 +2685,7 @@ int __glXGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
int numFBConfigs, i, p;
__GLXscreenInfo *pGlxScreen;
-if (screen screenInfo.numScreens) {
+if (screen = screenInfo.numScreens) {
/* The client library must send a valid screen number. */
client-errorValue = screen;
return BadValue;
@@ -3106,7 +3106,7 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
/*
** Look up screen and FBConfig.
*/
-if (screen screenInfo.numScreens) {
+if (screen = screenInfo.numScreens) {
/* The client library must send a valid screen number. */
client-errorValue = screen;
return BadValue;
diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c
index b3720f6..780ca42 100644
--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@@ -251,7 +251,7 @@ int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte
*pc)
__GLX_SWAP_INT(req-screen);
screen = req-screen;
-if (screen screenInfo.numScreens) {
+if (screen = screenInfo.numScreens) {
/* The client library must send a valid screen number. */
client-errorValue = screen;
return BadValue;
diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
index 231b098..9f38908 100644
--- a/hw/kdrive/ephyr/ephyrdriext.c
+++ b/hw/kdrive/ephyr/ephyrdriext.c
@@ -470,7 +470,7 @@ EphyrDuplicateVisual (unsigned int a_screen,
int i=0 ;
EPHYR_LOG (enter\n) ;
-if (a_screen screenInfo.numScreens) {
+if (a_screen = screenInfo.numScreens) {
EPHYR_LOG_ERROR (bad screen number\n) ;
goto out;
}
commit bcab9213fbafa3091d2f5c831bb668cacaec5f8b
Author: Julien Cristau jcris...@debian.org
Date: Tue Nov 30 17:23:10 2010 +0100
DGA: fix screen number check
screenInfo.numScreens is not a valid screen number, they go from 0 to
numScreens - 1.
Signed-off-by: Julien Cristau jcris...@debian.org
Reviewed-by: Keith Packard kei...@keithp.com
Signed-off-by: Keith Packard kei...@keithp.com
(cherry picked from commit 8684543021b9b1aa165b1bc69bc58685cb5942c1)
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c
b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 5367bcc..3742c2b 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -139,7 +139,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
char *deviceName;
int nameSize;
-if (stuff-screen screenInfo.numScreens)
+if (stuff-screen = screenInfo.numScreens)
return BadValue;
if (!DGAAvailable(stuff-screen))
@@ -173,7 +173,7 @@ ProcXDGACloseFramebuffer(ClientPtr client)
{
REQUEST(xXDGACloseFramebufferReq);
-if (stuff-screen screenInfo.numScreens)
+if (stuff-screen = screenInfo.numScreens)
return BadValue;
if (!DGAAvailable(stuff-screen))
@@ -195,7 +195,7 @@ ProcXDGAQueryModes(ClientPtr client)
xXDGAModeInfo info;
XDGAModePtr mode;
-if (stuff-screen screenInfo.numScreens)
+if (stuff-screen = screenInfo.numScreens)
return BadValue;
REQUEST_SIZE_MATCH(xXDGAQueryModesReq);
@@ -313,7 +313,7 @@ ProcXDGASetMode(ClientPtr client)
PixmapPtr pPix;
int size;
-if (stuff-screen screenInfo.numScreens)
+if (stuff-screen = screenInfo.numScreens)
return BadValue;
REQUEST_SIZE_MATCH(xXDGASetModeReq);
@@ -402,7 +402,7 @@ ProcXDGASetViewport(ClientPtr client)
{
REQUEST(xXDGASetViewportReq);
-if (stuff-screen screenInfo.numScreens)
+if (stuff-screen = screenInfo.numScreens)
return BadValue;
xorg-server: Changes to 'debian-unstable'
ChangeLog| 58 +++ debian/changelog |7 +++- hw/dmx/glxProxy/glxcmds.c|6 +-- hw/dmx/glxProxy/glxcmdsswap.c|2 - hw/kdrive/ephyr/ephyrdriext.c|2 - hw/xfree86/dixmods/extmod/xf86dga2.c | 46 +-- hw/xfree86/modes/xf86RandR12.c | 10 ++ 7 files changed, 101 insertions(+), 30 deletions(-) New commits: commit bf96cc3f878a1b7450bcb30b98d3ea3c8225b462 Author: Julien Cristau jcris...@debian.org Date: Thu Dec 2 00:40:01 2010 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 89d6d75..cdeb157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.7.7-10) UNRELEASED; urgency=low +xorg-server (2:1.7.7-10) unstable; urgency=low * render: Fix byteswapping of gradient stops * Cherry-pick from upstream: @@ -8,7 +8,7 @@ xorg-server (2:1.7.7-10) UNRELEASED; urgency=low - fix screen number checks * Refresh patches. - -- Julien Cristau jcris...@debian.org Thu, 18 Nov 2010 16:46:32 +0100 + -- Julien Cristau jcris...@debian.org Thu, 02 Dec 2010 00:39:50 +0100 xorg-server (2:1.7.7-9) unstable; urgency=low commit e3c646c7ceefcf92d52e962c22015403b99684e7 Author: Julien Cristau jcris...@debian.org Date: Thu Dec 2 00:33:06 2010 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 34c08d5..58e8aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,61 @@ +commit 6f7f3e2b799984e1b8aade89726dc226fc0b89ac +Author: Cyril Brulebois k...@debian.org +Date: Wed Dec 1 14:12:55 2010 +0100 + +Fix screen number checks. + +screenInfo.numScreens is not a valid screen number, they go from 0 to +numScreens - 1. + +Signed-off-by: Cyril Brulebois k...@debian.org +Reviewed-by: Alex Deucher alexdeuc...@gmail.com +Signed-off-by: Keith Packard kei...@keithp.com +(cherry picked from commit 279ef1ffd787dba2f0d5056849b9cb15d36aa3eb) + +commit bcab9213fbafa3091d2f5c831bb668cacaec5f8b +Author: Julien Cristau jcris...@debian.org +Date: Tue Nov 30 17:23:10 2010 +0100 + +DGA: fix screen number check + +screenInfo.numScreens is not a valid screen number, they go from 0 to +numScreens - 1. + +Signed-off-by: Julien Cristau jcris...@debian.org +Reviewed-by: Keith Packard kei...@keithp.com +Signed-off-by: Keith Packard kei...@keithp.com +(cherry picked from commit 8684543021b9b1aa165b1bc69bc58685cb5942c1) + +commit f86265529b1506a3946d6e3d6fed77a6702108b1 +Author: Bill Nottingham nott...@redhat.com +Date: Mon Nov 15 11:25:14 2010 +1000 + +xfree86: store the screen's gamma information on init. + +This fixes a gamma issue on vt switch observed with KDM. VT switching away +and back would result in a black screen. Avoid this by storing the current +gamma information on init. + +https://bugzilla.redhat.com/show_bug.cgi?id=533217 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Keith Packard kei...@keithp.com +Signed-off-by: Keith Packard kei...@keithp.com +(cherry picked from commit 566d09a5cd6452ee2e05e23d2205e7c3aa31f0da) + +commit 333a6355917c552132e1dd3a2aa066c5b7e70566 +Author: Adam Jackson a...@redhat.com +Date: Mon Nov 15 11:25:12 2010 +1000 + +xfree86: apply gamma settings on EnterVT. + +When entering the VT, re-apply the saved gamma settings for each screen. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Keith Packard kei...@keithp.com +Signed-off-by: Keith Packard kei...@keithp.com +(cherry picked from commit c050aa2f5fa6a7ff8ce4f91def14ca44f799f067) + commit c9bca39848add875a76cf2434aabbadb97ddd721 Author: Peter Hutterer peter.hutte...@who-t.net Date: Wed Jun 9 17:10:57 2010 +1000 diff --git a/debian/changelog b/debian/changelog index 86b943b..89d6d75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ xorg-server (2:1.7.7-10) UNRELEASED; urgency=low * render: Fix byteswapping of gradient stops * Cherry-pick from upstream: - Xi: reset the known properties at each server generation +- xfree86: apply gamma settings on EnterVT. +- xfree86: store the screen's gamma information on init. +- fix screen number checks * Refresh patches. -- Julien Cristau jcris...@debian.org Thu, 18 Nov 2010 16:46:32 +0100 commit 6f7f3e2b799984e1b8aade89726dc226fc0b89ac Author: Cyril Brulebois k...@debian.org Date: Wed Dec 1 14:12:55 2010 +0100 Fix screen number checks. screenInfo.numScreens is not a valid screen number, they go from 0 to numScreens - 1. Signed-off-by: Cyril Brulebois k...@debian.org Reviewed-by: Alex Deucher alexdeuc...@gmail.com Signed-off-by: Keith Packard kei...@keithp.com (cherry picked from commit 279ef1ffd787dba2f0d5056849b9cb15d36aa3eb) diff --git a/hw/dmx/glxProxy/glxcmds.c
xorg-server: Changes to 'refs/tags/xorg-server-2_1.7.7-10'
Tag 'xorg-server-2_1.7.7-10' created by Julien Cristau jcris...@debian.org at 2010-12-01 23:41 + Tagging upload of xorg-server 2:1.7.7-10 to unstable. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABCAAGBQJM9t1DAAoJEDEBgAUJBeQMIbcQAKW3mf3CebBHiHhNHa+oCGQx N9R9DXm4N5D97t2U0ZBQlD4tM23xvcegtke7yc9j2pk3SgNbNfr1hmODFoGBYVVq uJQr3ATiqnl3bSZ4edBTbKWDnz9vTj20HypuHzOTZ4camPBnZEvUCn7c3lpdbVRN lWaZlBT1lK7LMvlSwdIgtwnGj1GJNYqvaveMpAgPbjPViU9NX0vKBpPI8f4C1ht2 EgfVlxGNoAtt6PZbKnEgsaWtMcsIMoDrpEWX3h48iOS4c3hdC4AARCkrPlKQEXUQ zRa0YPOFtursoH6w6x+JH0ajftt95QZnydftCHaTl8f8MtSIY+fk8e1bbNqSZpg1 YEEGoMY8ujzp4S02MPRKspci/x4DdplAXPDqmJw+n28yZuVYCuxyl2kxKObTJBpe RFIZXHUSCSAxVFAZAij2H1sc5+ajpG8qY7UPwJH98rzELH88SJL9uyMwtBuIVZfX yyMdNB+geGRlHNbRWolE1CLfEfniErkuoUxaV1C/swm0C4vlk3YFVBZS5R9GXZDJ pb7AbIaQfCBZ1smNPCRxFFhw57Za3pea3QAp42n55mLUxI8OqK0iRcoEdl8DgpoF +eRqatwBgRi/KPicySMZLz5M+4+rptL5DlUy8WJ66sF2EeqYAsLNskWWYGbRSp2d dS1lOgvvMQO5yWzeLOqS =tGXS -END PGP SIGNATURE- Changes since xorg-server-2_1.7.7-9: Adam Jackson (2): ddc: Don't probe for DDC/CI or EEPROM xfree86: apply gamma settings on EnterVT. Bill Nottingham (1): xfree86: store the screen's gamma information on init. Cyril Brulebois (2): Mention upstream git URL in a comment. Fix screen number checks. Julien Cristau (9): render: Fix byteswapping of gradient stops Merge branch 'server-1.7-branch' of git://anongit.freedesktop.org/git/xorg/xserver into debian-unstable Bump changelogs Refresh patches. Merge remote branch 'origin/debian-unstable' into debian-unstable DGA: fix screen number check Merge branch 'server-1.7-branch' of git://anongit.freedesktop.org/git/xorg/xserver into debian-unstable Bump changelogs Upload to unstable Peter Hutterer (2): Xi: reset the known properties at the end of the server generation. Xi: move property reset from extension shutdown to init. --- ChangeLog | 98 +- Xi/extinit.c |3 Xi/xiproperty.c |9 + Xi/xiproperty.h |3 debian/changelog | 12 + debian/patches/07-xfree86-fix-build-with-xv-disabled.diff | 16 +- debian/patches/10-config-libudev-backend.diff | 80 +-- debian/patches/15-nouveau.diff| 43 ++ debian/patches/19-compresize-fix.diff | 71 -- debian/patches/22-render-swap-stops.diff | 33 debian/patches/series |1 debian/watch |1 hw/dmx/glxProxy/glxcmds.c |6 hw/dmx/glxProxy/glxcmdsswap.c |2 hw/kdrive/ephyr/ephyrdriext.c |2 hw/xfree86/dixmods/extmod/xf86dga2.c | 46 +++--- hw/xfree86/modes/xf86RandR12.c| 10 + 17 files changed, 297 insertions(+), 139 deletions(-) --- -- 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/e1pnxeu-0007kh...@alioth.debian.org
Processing of xorg-server_1.7.7-10_i386.changes
xorg-server_1.7.7-10_i386.changes uploaded successfully to localhost along with the files: xorg-server_1.7.7-10.dsc xorg-server_1.7.7-10.diff.gz xserver-common_1.7.7-10_all.deb xserver-xorg-core_1.7.7-10_i386.deb xserver-xorg-core-udeb_1.7.7-10_i386.udeb xserver-xorg-dev_1.7.7-10_i386.deb xdmx_1.7.7-10_i386.deb xdmx-tools_1.7.7-10_i386.deb xnest_1.7.7-10_i386.deb xvfb_1.7.7-10_i386.deb xserver-xephyr_1.7.7-10_i386.deb xserver-xfbdev_1.7.7-10_i386.deb xserver-xorg-core-dbg_1.7.7-10_i386.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- 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/e1pnxlx-ex...@franck.debian.org
xorg-server_1.7.7-10_i386.changes ACCEPTED into unstable
Accepted: xdmx-tools_1.7.7-10_i386.deb to main/x/xorg-server/xdmx-tools_1.7.7-10_i386.deb xdmx_1.7.7-10_i386.deb to main/x/xorg-server/xdmx_1.7.7-10_i386.deb xnest_1.7.7-10_i386.deb to main/x/xorg-server/xnest_1.7.7-10_i386.deb xorg-server_1.7.7-10.diff.gz to main/x/xorg-server/xorg-server_1.7.7-10.diff.gz xorg-server_1.7.7-10.dsc to main/x/xorg-server/xorg-server_1.7.7-10.dsc xserver-common_1.7.7-10_all.deb to main/x/xorg-server/xserver-common_1.7.7-10_all.deb xserver-xephyr_1.7.7-10_i386.deb to main/x/xorg-server/xserver-xephyr_1.7.7-10_i386.deb xserver-xfbdev_1.7.7-10_i386.deb to main/x/xorg-server/xserver-xfbdev_1.7.7-10_i386.deb xserver-xorg-core-dbg_1.7.7-10_i386.deb to main/x/xorg-server/xserver-xorg-core-dbg_1.7.7-10_i386.deb xserver-xorg-core-udeb_1.7.7-10_i386.udeb to main/x/xorg-server/xserver-xorg-core-udeb_1.7.7-10_i386.udeb xserver-xorg-core_1.7.7-10_i386.deb to main/x/xorg-server/xserver-xorg-core_1.7.7-10_i386.deb xserver-xorg-dev_1.7.7-10_i386.deb to main/x/xorg-server/xserver-xorg-dev_1.7.7-10_i386.deb xvfb_1.7.7-10_i386.deb to main/x/xorg-server/xvfb_1.7.7-10_i386.deb Override entries for your package: xdmx-tools_1.7.7-10_i386.deb - optional x11 xdmx_1.7.7-10_i386.deb - optional x11 xnest_1.7.7-10_i386.deb - optional x11 xorg-server_1.7.7-10.dsc - source x11 xserver-common_1.7.7-10_all.deb - optional x11 xserver-xephyr_1.7.7-10_i386.deb - optional x11 xserver-xfbdev_1.7.7-10_i386.deb - optional x11 xserver-xorg-core-dbg_1.7.7-10_i386.deb - extra debug xserver-xorg-core-udeb_1.7.7-10_i386.udeb - optional debian-installer xserver-xorg-core_1.7.7-10_i386.deb - optional x11 xserver-xorg-dev_1.7.7-10_i386.deb - optional x11 xvfb_1.7.7-10_i386.deb - optional x11 Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- 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/e1pnxzc-0002gi...@franck.debian.org
xorg: Changes to 'ubuntu'
0 files changed New commits: commit 4985ef0e33b6b1759dc151b68bcc9604ee33573e Author: Bryce Harrington br...@canonical.com Date: Wed Dec 1 19:34:42 2010 -0800 Revert Avoid letting client apps fill up .xsession-errors This reverts commit 46bcf575298d3c70a4eb702a5a34a03c899c1dca. diff --git a/debian/changelog b/debian/changelog index 2c1ed6a..8dd4974 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,6 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low * debian/local/Failsafe/failsafeXinit: + Fix variable escaping so shows file name for debugging tarball (LP: #596819) - * debian/local/Xsession: -+ Limit size of .xsession-errors so client apps don't fill it up - (LP: #589275) xorg (1:7.5+6ubuntu3) maverick; urgency=low diff --git a/debian/local/Xsession b/debian/local/Xsession index e1a353b..6b071c7 100644 --- a/debian/local/Xsession +++ b/debian/local/Xsession @@ -80,8 +80,7 @@ if [ `stat -c%s \$ERRFILE\` -gt 50 ]; then tail -c 50 $ERRFILE $T mv -f $T $ERRFILE || rm -f $T fi -# prevent wayward client apps to fill disk with error messages -exec 21 | head -c 500 $ERRFILE +exec $ERRFILE 21 echo $PROGNAME: X session started for $LOGNAME at $(date) commit 46bcf575298d3c70a4eb702a5a34a03c899c1dca Author: Bryce Harrington br...@canonical.com Date: Wed Dec 1 19:25:05 2010 -0800 Avoid letting client apps fill up .xsession-errors diff --git a/debian/changelog b/debian/changelog index 8dd4974..2c1ed6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low * debian/local/Failsafe/failsafeXinit: + Fix variable escaping so shows file name for debugging tarball (LP: #596819) + * debian/local/Xsession: ++ Limit size of .xsession-errors so client apps don't fill it up + (LP: #589275) xorg (1:7.5+6ubuntu3) maverick; urgency=low diff --git a/debian/local/Xsession b/debian/local/Xsession index 6b071c7..e1a353b 100644 --- a/debian/local/Xsession +++ b/debian/local/Xsession @@ -80,7 +80,8 @@ if [ `stat -c%s \$ERRFILE\` -gt 50 ]; then tail -c 50 $ERRFILE $T mv -f $T $ERRFILE || rm -f $T fi -exec $ERRFILE 21 +# prevent wayward client apps to fill disk with error messages +exec 21 | head -c 500 $ERRFILE echo $PROGNAME: X session started for $LOGNAME at $(date) -- 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/e1po00u-0007nq...@alioth.debian.org
Bug#600490: Russian phonetic layout on a jp keyboard?
On 29 November 2010 07:36, Samuel Thibault sthiba...@debian.org wrote: [...] yes. In my /etc/X11/xorg.conf I used to have, in the keyboard section, Option XkbLayout jp,ru(phonetic) Option XkbVariant jp106 and it worked. Now I can select Russia Phonetic keyboard in Gnome Keyboard Preferences, but then I am stuck with Cyrillic characters only - the switching does not work. The only way out is to remove this keyboard choice and restart X. Did you try to put the same kind of parameter as xorg.conf into /etc/default/keyboard? It should be working exactly the same as xorg.conf (except that it'll additionally work on the linux console too!) Just tried it, and yes, it does fix the problem! Thank you for your time. I still get an occasional gnome popup indicating an xkb error. It asks to provide the following outputs: $ xprop -root | grep XKB _XKB_RULES_NAMES_BACKUP(STRING) = evdev, acpi, jp,ru, , grp:alt_shift_toggle _XKB_RULES_NAMES(STRING) = evdev, acpi, jp,ru(phonetic), , grp:alt_shift_toggle $ gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd layouts = [jp jp106] options = [terminate terminate:ctrl_alt_bksp,grp grp:ctrl_shift_toggle,grp grp:alt_space_toggle,grp grp:menu_toggle,grp grp:sclk_toggle] model = toshiba_s3000 Note jp106 string in gconftool-2. I do not know where it comes from (do I still have an old config file lying around?) and whether it is harmless. The model string content there is totally random, of course, and has nothing to do with the real keyboard. [...] Best, Dmitrii -- 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/aanlktimriwer55hojo59dikhew2rc2_miwbcvz1no...@mail.gmail.com
